Merge branch 'merge-master-into-client-testing'

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/build.xml

bigbluebutton-client/html-template/AC_OETags.js

...button-client/html-template/bbb-deskshare-applet-0.71.jar

bigbluebutton-client/html-template/bbb_blinker.js

bigbluebutton-client/html-template/bbb_deskshare.js

bigbluebutton-client/html-template/bbb_localization.js

bigbluebutton-client/html-template/bigbluebutton.js

bigbluebutton-client/html-template/deployJava.js

bigbluebutton-client/html-template/history/history.js

bigbluebutton-client/html-template/index.template.html

bigbluebutton-client/html-template/jquery-1.5.1.min.js

bigbluebutton-client/html-template/swfobject.js

bigbluebutton-client/libs/melomel-0.6.2.swc

bigbluebutton-client/resources/prod/BigBlueButton.html

bigbluebutton-client/resources/prod/BigBlueButtonTest.html

bigbluebutton-client/src/BigBlueButton.mxml

bigbluebutton-client/src/BigBlueButtonTest.mxml

bigbluebutton-client/src/SettingsModule.mxml

.../src/org/bigbluebutton/common/events/LocaleChangeEvent.as