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

bbb-api-examples/PHP/bbb_api.inc.php

bbb-api-examples/PHP/bbb_api.php

bbb-api-examples/PHP/bbb_api_conf.inc.php

bbb-api-examples/PHP/demo1.php

bbb-voice-conference/config/app_konference/app_konference.so

bigbluebutton-client/README

bigbluebutton-client/build.xml

bigbluebutton-client/build/lib/ant-contrib-0.6.jar

bigbluebutton-client/copyright.txt

bigbluebutton-client/resources/BigBlueButton.html

bigbluebutton-client/resources/DeskshareStandalone.html

bigbluebutton-client/src/DeskshareStandalone.mxml

bigbluebutton-client/src/conf/.gitignore

bigbluebutton-client/src/conf/config.xml.dev

bigbluebutton-client/src/conf/config.xml.template

bigbluebutton-client/src/conf/locales.xml

...org/bigbluebutton/main/managers/BigBlueButtonPreloader.as

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

...dules/deskShare/view/components/DesktopPublishWindow.mxml

.../modules/deskShare/view/components/DesktopViewWindow.mxml