Merge remote branch 'upstream/master' into add-single-hand-lowering

bigbluebutton-client/locale/en_US/bbbResources.properties

...-client/src/org/bigbluebutton/main/model/users/BBBUser.as

...ient/src/org/bigbluebutton/main/model/users/Conference.as

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml