Merge branch 'master' into listen-only-prototype

README.md

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala

.../scala/org/bigbluebutton/core/apps/users/UsersModel.scala

...button-client/resources/prod/lib/bbb_webrtc_bridge_sip.js

...dules/deskshare/view/components/DesktopPublishWindow.mxml

bigbluebutton-config/bigbluebutton-release

bigbluebutton-config/bin/bbb-conf

bigbluebutton-config/web/index.html

bigbluebutton-html5/app/client/globals.coffee

bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee

bigbluebutton-html5/app/client/main.html

bigbluebutton-html5/app/client/stylesheets/chat.less

bigbluebutton-html5/app/client/stylesheets/style.less

bigbluebutton-html5/app/client/stylesheets/users.less

bigbluebutton-html5/app/client/views/chat/chat_bar.html

bigbluebutton-html5/app/client/views/users/user_list.coffee

bigbluebutton-html5/app/client/views/users/users_list.html

...ebutton-html5/app/client/views/whiteboard/whiteboard.html

...ton-html5/app/public/packages/ionicons/fonts/ionicons.ttf

...on-html5/app/public/packages/ionicons/fonts/ionicons.woff