Merge pull request #299 from bigbluebutton/bbb-lock-settings

Implemented lock settings in bbb-client and bbb-apps.
Merge pull request #300 from BBBManager/bbb-issue-1656

Fix for issue #1656
Merge remote branch 'upstream/master'
Fixed copyright string in pt_BR
Merge remote branch 'upstream/master'
Removed the right duplicated code ;)