Merge branch 'capilkey-improve-client-annotation-edit' into bbb-2x-mconf

...n/scala/org/bigbluebutton/core/apps/WhiteboardModel.scala

...bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as

...n/modules/whiteboard/business/shapes/EllipseAnnotation.as

...tton/modules/whiteboard/business/shapes/LineAnnotation.as

...igbluebutton/modules/whiteboard/business/shapes/Pencil.as

...odules/whiteboard/business/shapes/PencilDrawAnnotation.as

...modules/whiteboard/business/shapes/RectangleAnnotation.as

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

.../modules/whiteboard/business/shapes/TriangleAnnotation.as

...button/modules/whiteboard/views/CursorPositionListener.as

...g/bigbluebutton/modules/whiteboard/views/IDrawListener.as

...bluebutton/modules/whiteboard/views/PencilDrawListener.as

...gbluebutton/modules/whiteboard/views/ShapeDrawListener.as

...igbluebutton/modules/whiteboard/views/TextDrawListener.as

...igbluebutton/modules/whiteboard/views/WhiteboardCanvas.as

...luebutton/modules/whiteboard/views/WhiteboardToolbar.mxml

...ebutton/modules/whiteboard/views/models/WhiteboardTool.as