Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

...ig/freeswitch/conf/autoload_configs/event_socket.conf.xml

bbb-voice-conference/config/freeswitch/conf/vars.xml

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/.flexProperties

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

...g/bigbluebutton/main/model/users/NetConnectionDelegate.as

...gbluebutton/modules/chat/events/PublicChatMessageEvent.as

...on/modules/chat/services/PublicChatSharedObjectService.as

...on/modules/chat/views/components/ChatMessageRenderer.mxml

...bigbluebutton/modules/chat/views/components/ChatView.mxml

...gbluebutton/modules/present/views/PresentationWindow.mxml

...rg/bigbluebutton/modules/videoconf/business/VideoProxy.as

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

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/web/index.html