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

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

...rg/bigbluebutton/conference/BigBlueButtonApplication.java

.../main/java/org/bigbluebutton/conference/RoomsManager.java

...ference/service/participants/ParticipantsApplication.java

...ient/src/org/bigbluebutton/main/events/AppVersionEvent.as

...tton-client/src/org/bigbluebutton/main/events/BBBEvent.as

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

...src/org/bigbluebutton/main/model/modules/ModuleManager.as

.../src/org/bigbluebutton/main/model/users/UsersSOService.as

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml

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

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