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

bigbluebutton-html5/app/client/main.coffee

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

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

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

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

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

bigbluebutton-html5/app/client/views/modals/modals.html

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

...utton-html5/app/client/views/whiteboard/whiteboard.coffee

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