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

bigbluebutton-html5/app/client/globals.coffee

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

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

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

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

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

bigbluebutton-html5/app/collections/collections.coffee

bigbluebutton-html5/app/lib/router.coffee

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

bigbluebutton-html5/app/server/publish.coffee

bigbluebutton-html5/app/server/redispubsub.coffee

bigbluebutton-html5/app/server/server.coffee

...b/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java