Merge pull request #625 from antobinary/lock-settings

...ton/conference/service/whiteboard/WhiteboardListener.java

...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala

.../src/main/scala/org/bigbluebutton/core/MeetingActor.scala

...in/scala/org/bigbluebutton/core/apps/users/UsersApp.scala

...client/src/org/bigbluebutton/main/views/LockSettings.mxml

bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee

bigbluebutton-html5/app/client/main.coffee

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

bigbluebutton-html5/app/client/views/chat/chat_bar.coffee

bigbluebutton-html5/app/client/views/chat/chat_bar.html

bigbluebutton-html5/app/client/views/users/user_item.coffee

bigbluebutton-html5/app/client/views/users/user_item.html

bigbluebutton-html5/app/config.coffee

...utton-html5/app/server/collection_methods/meetings.coffee

...uebutton-html5/app/server/collection_methods/users.coffee

bigbluebutton-html5/app/server/redispubsub.coffee

bigbluebutton-html5/app/server/user_permissions.coffee