Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3

bigbluebutton-html5/app/.meteor/packages

bigbluebutton-html5/app/.meteor/versions

bigbluebutton-html5/app/client/globals.coffee

bigbluebutton-html5/app/client/main.coffee

bigbluebutton-html5/app/client/main.html

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

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

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