Merge branch 'master' into update-webcam-when-switching-presenter

...ent/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml

...bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml

...rg/bigbluebutton/modules/notes/events/SaveSuccessEvent.as

...c/org/bigbluebutton/modules/notes/maps/NotesEventMap.mxml

...bigbluebutton/modules/notes/maps/NotesEventMapDelegate.as

...client/src/org/bigbluebutton/modules/notes/models/Note.as

.../src/org/bigbluebutton/modules/notes/models/NotesModel.as

...src/org/bigbluebutton/modules/notes/services/NoteSaver.as

...gbluebutton/modules/notes/services/NotesMessageService.as

...bluebutton/modules/notes/services/RetrieveNotesService.as

...c/org/bigbluebutton/modules/notes/views/NoteRenderer.mxml

.../src/org/bigbluebutton/modules/notes/views/NotesView.mxml

...a/org/bigbluebutton/deskshare/client/DeskshareClient.java

...ava/org/bigbluebutton/deskshare/client/DeskshareMain.java