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

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/.project

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/BbbTestRunner.mxml

bigbluebutton-client/src/branding/css/Blue.css

bigbluebutton-client/src/branding/css/BrushedMetal.css

bigbluebutton-client/src/branding/css/MacOS9.css

bigbluebutton-client/src/branding/css/WindowsXP_default.css

...tton-client/src/branding/css/assets/img/3_closeButton.png

...n-client/src/branding/css/assets/img/3_decreaseButton.png

...n-client/src/branding/css/assets/img/3_increaseButton.png

...n-client/src/branding/css/assets/img/3_minimizeButton.png

...n-client/src/branding/css/assets/img/BrushedMetalBack.jpg

bigbluebutton-client/src/branding/css/assets/img/bk3.jpg

...button-client/src/branding/css/assets/img/closeButton.png

...tton-client/src/branding/css/assets/img/cornerResize3.png

...ton-client/src/branding/css/assets/img/decreaseButton.png

...ton-client/src/branding/css/assets/img/increaseButton.png

...uebutton-client/src/branding/css/assets/img/menuArrow.png

...ton-client/src/branding/css/assets/img/minimizeButton.png