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

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/.actionScriptProperties.orig

bigbluebutton-client/.flexProperties.orig

bigbluebutton-client/build.xml

bigbluebutton-client/libs/PureMVC_AS3_MultiCore_1_0_4.swc

bigbluebutton-client/libs/Utility_AS3_AsyncStub_1_2.swc

...luebutton-client/libs/Utility_AS3_MultiCore_Pipes_0_9.swc

bigbluebutton-client/libs/Utility_AS3_StartupManager_1_2.swc

bigbluebutton-client/libs/fluint-1.1.1.swc

bigbluebutton-client/libs/sfapi.swc

bigbluebutton-client/locale/fr_CA/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/dev/join-mock.xml

bigbluebutton-client/resources/prod/locales.xml

bigbluebutton-client/src/BbbUnitTests.mxml

bigbluebutton-client/src/ChatModule.mxml

bigbluebutton-client/src/DeskShareModule.mxml

bigbluebutton-client/src/DeskshareStandalone.mxml

bigbluebutton-client/src/DynamicInfoModule.mxml

bigbluebutton-client/src/HighlighterModule.mxml