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

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

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

...bluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml

...utton/modules/whiteboard/views/WhiteboardTextToolbar.mxml