Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into mobile-lock-settings

...rg/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala

clients/flash/air-client/src/Assets.car

clients/flash/air-client/src/Default-320w-568h@2x~iphone.png

clients/flash/air-client/src/Default-375w-667h@2x~iphone.png

clients/flash/air-client/src/Default-414w-736h@3x~iphone.png

clients/flash/air-client/src/Default-568h@2x~iphone.png

clients/flash/air-client/src/Default-812h@3x~iphone.png

.../air-client/src/Default-Landscape-1024w-1366h@2x~ipad.png

clients/flash/air-client/src/Default-Landscape-1112h@2x.png

.../air-client/src/Default-Landscape-414w-736h@3x~iphone.png

...flash/air-client/src/Default-Landscape-812h@3x~iphone.png

clients/flash/air-client/src/Default-Landscape@2x~ipad.png

...ts/flash/air-client/src/Default-LandscapeLeft@2x~ipad.png

...s/flash/air-client/src/Default-LandscapeRight@2x~ipad.png

clients/flash/air-client/src/Default-LandscapeRight~ipad.png

clients/flash/air-client/src/Default-Landscape~ipad.png

clients/flash/air-client/src/Default-Portrait-1112h@2x.png

clients/flash/air-client/src/Default-Portrait@2x~ipad.png

...ash/air-client/src/Default-PortraitUpsideDown@2x~ipad.png

.../flash/air-client/src/Default-PortraitUpsideDown~ipad.png