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

...rg/bigbluebutton/conference/BigBlueButtonApplication.java

...va/org/bigbluebutton/conference/BigBlueButtonSession.java

.../conference/service/participants/ParticipantsHandler.java

...ce/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java

...org/bigbluebutton/conference/service/whiteboard/Page.java

...luebutton/conference/service/whiteboard/Presentation.java

.../conference/service/whiteboard/WhiteboardApplication.java

...ebutton/conference/service/whiteboard/WhiteboardRoom.java

...tton/conference/service/whiteboard/WhiteboardService.java

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template

bigbluebutton-client/resources/prod/BigBlueButton.html

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

...utton-client/src/org/bigbluebutton/main/model/PortTest.as

...-client/src/org/bigbluebutton/main/model/PortTestProxy.as

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

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

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

...ient/src/org/bigbluebutton/main/model/users/Conference.as

...ent/src/org/bigbluebutton/main/model/users/JoinService.as