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

...src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala

bbb-api-demo/src/main/webapp/create.jsp

bigbluebutton-html5/app/client/globals.coffee

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

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

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

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

bigbluebutton-html5/app/client/views/whiteboard/slide.coffee

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

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

...luebutton-html5/app/client/whiteboard_models/utils.coffee

...tml5/app/client/whiteboard_models/whiteboard_paper.coffee

bigbluebutton-html5/app/collections/collections.coffee

bigbluebutton-html5/app/lib/router.coffee

...ebutton-html5/app/server/collection_methods/cursor.coffee

...utton-html5/app/server/collection_methods/meetings.coffee

...-html5/app/server/collection_methods/presentations.coffee

...uebutton-html5/app/server/collection_methods/users.coffee

bigbluebutton-html5/app/server/publish.coffee

bigbluebutton-html5/app/server/server.coffee