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

...ton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties

bigbluebutton-client/build.xml

bigbluebutton-client/locale/cs_CZ/bbbResources.properties

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/locale/es_ES/bbbResources.properties

bigbluebutton-client/locale/fr_FR/bbbResources.properties

bigbluebutton-client/locale/ja_JP/bbbResources.properties

bigbluebutton-client/locale/ru_RU/bbbResources.properties

bigbluebutton-client/locale/tr_TR/bbbResources.properties

bigbluebutton-client/locale/zh_CN/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

...utton-client/resources/prod/bbb-deskshare-applet-0.64.jar

bigbluebutton-client/src/ViewersModule.mxml

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

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

...n-client/src/org/bigbluebutton/main/events/LogoutEvent.as