Merge branch 'master' into client-logging-to-server

...main/java/org/bigbluebutton/red5/service/ChatService.java

bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

...t/src/org/bigbluebutton/modules/chat/model/ChatOptions.as

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