- merge some new stuff

.gitignore

bbb-api-demo/src/main/webapp/bbb_api.jsp

bbb-api-demo/src/main/webapp/demo1.jsp

bigbluebutton-apps/.classpath.old

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

...main/java/org/bigbluebutton/conference/ClientMessage.java

...rg/bigbluebutton/conference/ConnectionInvokerService.java

...rg/bigbluebutton/conference/service/chat/ChatService.java

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

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

.../recorder/whiteboard/ModifyTextWhiteboardRecordEvent.java

.../recorder/whiteboard/ToggleGridWhiteboardRecordEvent.java

.../service/recorder/whiteboard/WhiteboardEventRecorder.java

...onference/service/whiteboard/IWhiteboardRoomListener.java

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

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

...luebutton/conference/service/whiteboard/ShapeGraphic.java

...bluebutton/conference/service/whiteboard/TextGraphic.java

...luebutton/conference/service/whiteboard/UIDGenerator.java

...igbluebutton/conference/service/whiteboard/WBGraphic.java