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

bigbluebutton-client/resources/dev/join-mock.xml

.../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/grails-app/conf/bigbluebutton.properties