Merge pull request #3140 from antobinary/router-merging

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

bigbluebutton-html5/Gruntfile.js

bigbluebutton-html5/client/main.jsx

bigbluebutton-html5/imports/api/FontControl/index.js

bigbluebutton-html5/imports/api/chat/index.js

...mports/api/chat/server/methods/sendChatMessagetoServer.js

.../imports/api/chat/server/modifiers/addChatToCollection.js

.../imports/api/chat/server/modifiers/clearChatCollection.js

...-html5/imports/api/chat/server/modifiers/eventHandlers.js

bigbluebutton-html5/imports/api/chat/server/publications.js

bigbluebutton-html5/imports/api/cursor/index.js

...orts/api/cursor/server/modifiers/clearCursorCollection.js

...tml5/imports/api/cursor/server/modifiers/eventHandlers.js

...5/imports/api/cursor/server/modifiers/initializeCursor.js

...ports/api/cursor/server/modifiers/updateCursorLocation.js

...luebutton-html5/imports/api/cursor/server/publications.js

bigbluebutton-html5/imports/api/deskshare/index.js

...pi/deskshare/server/modifiers/clearDeskshareCollection.js

...s/api/deskshare/server/modifiers/handleDeskShareChange.js

...kshare/server/modifiers/handleIncomingDeskshareMessage.js