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

...uebutton-client/branding/default/style/css/BBBDefault.css

bigbluebutton-client/resources/config.xml.template

...ebutton-client/src/org/bigbluebutton/core/model/Config.as

bigbluebutton-client/src/org/bigbluebutton/core/vo/Config.as

...ton-client/src/org/bigbluebutton/core/vo/ConfigBuilder.as

...ient/src/org/bigbluebutton/main/model/ConfigParameters.as

...org/bigbluebutton/main/model/modules/ModulesDispatcher.as

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

...-client/src/org/bigbluebutton/main/views/MainToolbar.mxml

...ent/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml

...bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml