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
the public chat messages are now displayed correctly - just once
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
 - still the lock icon is not updating properly
 - apply lock icon to viewers only