Merge commit 'bbb/master'

bbb-common-message/build.gradle

bbb-voice/build.gradle

...c/main/java/org/bigbluebutton/voiceconf/sip/SdpUtils.java

bigbluebutton-apps/build.gradle

bigbluebutton-client/.actionScriptProperties

bigbluebutton-client/.flexProperties

bigbluebutton-client/src/ExampleChatModule.mxml

bigbluebutton-client/src/VideoconfModule.mxml

...src/org/bigbluebutton/modules/example/ExampleChatProxy.as

.../org/bigbluebutton/modules/example/ExampleChatWindow.mxml

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

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

...ient/src/org/bigbluebutton/modules/notes/views/Notes.mxml

.../bigbluebutton/modules/phone/maps/PhoneLocalEventMap.mxml

...uebutton/modules/phone/maps/PhoneLocalEventMapDelegate.as

...ebutton/modules/phone/views/components/ToolbarButton.mxml

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/web/index.html

bigbluebutton-web/.gitignore

bigbluebutton-web/build.gradle