Merge branch 'master' into merge-master-into-dynamic-config

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

.../src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml

...igbluebutton/modules/users/business/ListenersSOService.as

...luebutton/modules/users/business/NetConnectionDelegate.as

...rc/org/bigbluebutton/modules/users/business/UsersProxy.as

...gbluebutton/modules/users/events/StartUsersModuleEvent.as

...igbluebutton/modules/users/events/StopUsersModuleEvent.as

.../src/org/bigbluebutton/modules/users/events/UsersEvent.as

.../org/bigbluebutton/modules/users/events/UsersRollEvent.as

...org/bigbluebutton/modules/users/events/ViewCameraEvent.as

.../org/bigbluebutton/modules/users/managers/UsersManager.as

...c/org/bigbluebutton/modules/users/maps/UsersEventMap.mxml