Merge branch 'merge-polling-with-master' of https://github.com/bigbluebutton/bigbluebutton into merge-polling-with-master
public chat messages are displayed, emitted, received...; right now each chat message is displayed twice (both in the flash and html5 clients).
the usernames in the userlist are no longer surrounded by quotation marks
 - remove user sessions from hashmap when user leaves and when meeting is destroyed to
   prevent memory leaks
the public chat messages are now displayed correctly - just once
 - disable/enable users list in chat window when private chat is enabled/disabled
 - show lock icon when a settings are locked
 - add [Disabled] text beside feature name
Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into have-server-send-data-when-user-joins
 - try to apply lock settings to moderator only