initial changes for third party page
Merge branch 'master' into presentation-js-api
listen js conversion events
Merge branch 'presentation-js-api' of https://github.com/bigbluebutton/bigbluebutton into presentation-js-api
fix for presentation name in JS presentation api
Merge branch 'master' into presentation-js-api
 - scale the video properly and turn on smoothing video when scaled
fix for java showing security warning when closing desktopsharing
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton
Fixed typo
 - cleanup presentation upload event names
Added back allowKickUser='true' to config.xml.template
Minor tweak to increase the height of border on default landing page
Layout fix for issue https://code.google.com/p/bigbluebutton/issues/detail?id=1498
Dynamic config.xml demo now uses getDefaultConfigXML ccall
 - display webcam standalone properly maintaining aspect ratio
 - display mute/unmute control only when user is joined to the voice conference
 - display properly switch presenter and eject buttons depending on role of user
Merge remote branch 'upstream/master' into accessible-audio-settings
Focus moves to first button on Main Toolbar after user chooses to Join or Cancel in Audio Settings Window.