Merge branch 'master' into hangout-style

bbb-api-demo/src/main/webapp/create.jsp

bbb-api-demo/src/main/webapp/demo10.jsp

bbb-api-demo/src/main/webapp/demo4.jsp

bbb-api-demo/src/main/webapp/demo5.jsp

bbb-api-demo/src/main/webapp/js/jquery-ui.css

bbb-api-demo/src/main/webapp/js/jquery.min.js

bbb-api-demo/src/main/webapp/js/jquery.validate.min.js

bigbluebutton-client/resources/config.xml.template

...n-client/src/org/bigbluebutton/main/views/MainCanvas.mxml

...bluebutton/modules/deskshare/managers/DeskshareManager.as

...button/modules/deskshare/managers/PublishWindowManager.as

...button/modules/deskshare/managers/ToolbarButtonManager.as

...gbluebutton/modules/deskshare/maps/DeskshareEventMap.mxml

...bigbluebutton/modules/deskshare/model/DeskshareOptions.as

...bluebutton/modules/deskshare/services/DeskshareService.as

...modules/deskshare/services/SharedObjectCallbackHandler.as

...dules/deskshare/view/components/DesktopPublishWindow.mxml

.../bigbluebutton/modules/videoconf/views/PublishWindow.mxml

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/cron.daily/bigbluebutton