Merge branch 'merge-presentation-deskshare' of github.com:alexandrekreis/bigbluebutton into merge-presentation-deskshare