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

bbb-api-examples/PHP/bbb_api.php

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/.flexProperties

bigbluebutton-client/.gitignore

bigbluebutton-client/build.xml

bigbluebutton-client/locale/bg_BG/bbbResources.properties

bigbluebutton-client/locale/ja_JP/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/src/BreakoutModule.mxml

bigbluebutton-client/src/VideoconfModule.mxml

...tton-client/src/org/bigbluebutton/common/LabelTruncate.as

...src/org/bigbluebutton/main/model/modules/ModuleManager.as

...-client/src/org/bigbluebutton/main/model/users/BBBUser.as

...n-client/src/org/bigbluebutton/main/views/MainCanvas.mxml

.../bigbluebutton/modules/breakout/business/BreakoutProxy.as

.../bigbluebutton/modules/breakout/events/CreateRoomEvent.as

...bluebutton/modules/breakout/events/StartBreakoutModule.as

...igbluebutton/modules/breakout/managers/BreakoutManager.as

.../org/bigbluebutton/modules/breakout/maps/BreakoutMap.mxml

.../bigbluebutton/modules/breakout/views/BreakoutButton.mxml