Merge branch 'master' into record-and-playback-feature

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/VideoconfModule.mxml

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

...gbluebutton/main/model/users/events/StreamStartedEvent.as

...g/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml

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

...gbluebutton/modules/videoconf/views/TiledVideoWindow.mxml

...g/bigbluebutton/modules/viewers/events/ViewCameraEvent.as

...gbluebutton/modules/viewers/views/StatusItemRenderer.mxml

bigbluebutton-config/bin/bbb-conf