Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into add-sanity-check

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

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

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

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

...ice/recorder/whiteboard/AddTextWhiteboardRecordEvent.java

.../recorder/whiteboard/ModifyTextWhiteboardRecordEvent.java

.../service/recorder/whiteboard/WhiteboardEventRecorder.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/.gitignore

bigbluebutton-client/.project

bigbluebutton-client/README

bigbluebutton-client/config/bigbluebutton.nginx

bigbluebutton-client/libs/flexlib-bbb.swc

bigbluebutton-client/libs/flexlib.swc

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/config.xml.template