- I think there is still some work on messages between akka-apps and the video-transcoder.
  Merging so that we can do builds while Paulo works on the messages.

Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge

[HTML5 2.0] Move poll messages to 2.0

bbb_web - modified stun/turn api

[HTML5 2.0] Move captions messages to 2.0

Old 1.1 messages are still available there

Added fail cases to fallback to JWS

[HTML5 - 2.0] Change relative path of the sass imports to absolute

[HTML5 2.0] Merge master branch into mconf

 - restructure handlers to make it easier to test

 - display users list for private chat

 convert get users query to 2x

Implement meeting expiry

Merge branch 'cleanup-old-1.1-apps' of https://github.com/capilkey/bigbluebutton into capilkey-cleanup-old-1.1-apps

Clean up pre-2.0 voice message code

Cleanup of whiteboard, caption, and poll