Merge branch 'capilkey-hide-unneeded-components' into bbb-2x-mconf

bigbluebutton-client/resources/config.xml.template

...src/org/bigbluebutton/main/model/options/LayoutOptions.as

...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml

...-client/src/org/bigbluebutton/main/views/MainToolbar.mxml

...src/org/bigbluebutton/modules/users/model/UsersOptions.as