Merge pull request #17 from capilkey/multi-user-2.0-take3

...src/main/scala/org/bigbluebutton/core/RecorderActor.scala

...ain/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala

.../org/bigbluebutton/common/messages/WhiteboardKeyUtil.java

bigbluebutton-client/src/org/bigbluebutton/common/Images.as

...nt/src/org/bigbluebutton/common/assets/images/ellipse.png

...lient/src/org/bigbluebutton/common/assets/images/line.png

...ent/src/org/bigbluebutton/common/assets/images/pencil.png

...ent/src/org/bigbluebutton/common/assets/images/square.png

...lient/src/org/bigbluebutton/common/assets/images/text.png

...t/src/org/bigbluebutton/common/assets/images/triangle.png

...g/bigbluebutton/modules/present/events/NavigationEvent.as

...uebutton/modules/present/ui/views/PresentationWindow.mxml

...org/bigbluebutton/modules/present/ui/views/SlideView.mxml

...button/modules/whiteboard/WhiteboardCanvasDisplayModel.as

...uebutton/modules/whiteboard/business/shapes/DrawObject.as

...utton/modules/whiteboard/business/shapes/GraphicObject.as

...button/modules/whiteboard/business/shapes/ShapeFactory.as

...uebutton/modules/whiteboard/business/shapes/TextObject.as

...tton/modules/whiteboard/events/GraphicObjectFocusEvent.as

...uebutton/modules/whiteboard/events/WhiteboardDrawEvent.as