Merge branch 'master' into upgrade-to-red5-r4597

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

bbb-api-demo/src/main/webapp/demo11.html

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

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

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

bbb-api-demo/src/main/webapp/images/headset.png

bbb-api-demo/src/main/webapp/images/headset_close.png

bbb-api-demo/src/main/webapp/images/headset_open.png

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

bigbluebutton-apps/build.gradle

bigbluebutton-client/build.xml

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/layout.xml

bigbluebutton-client/src/BigBlueButton.mxml

bigbluebutton-client/src/UsersModule.mxml

bigbluebutton-client/src/conf/layout.xml

...client/src/org/bigbluebutton/main/events/ShortcutEvent.as

...-client/src/org/bigbluebutton/main/model/users/BBBUser.as

...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml