Merge remote-tracking branch 'upstream/master' into 2.1-air-userlist

...rs/org/bigbluebutton/web/controllers/ApiController.groovy

clients/flash/air-client/src/Default.css

clients/flash/air-client/src/css/hdpi.css

clients/flash/air-client/src/css/ldpi.css

clients/flash/air-client/src/css/mdpi.css

clients/flash/air-client/src/css/xhdpi.css

clients/flash/air-client/src/css/xxhdpi.css

clients/flash/air-client/src/css/xxxhdpi.css

...s/flash/air-client/src/org/bigbluebutton/air/AppConfig.as

...h/air-client/src/org/bigbluebutton/air/main/MainConfig.as

.../bigbluebutton/air/main/commands/JoinMeetingCommandAIR.as

...client/src/org/bigbluebutton/air/main/models/UISession.as

...g/bigbluebutton/air/main/services/GuestWaitPageService.as

...nt/src/org/bigbluebutton/air/main/services/JoinService.as

...org/bigbluebutton/air/main/views/LoadingScreenMediator.as

...org/bigbluebutton/lib/common/utils/GuestWaitURLFetcher.as

...nscript/org/bigbluebutton/lib/main/models/IUserSession.as

...script/org/bigbluebutton/lib/main/models/MeetingStatus.as

...onscript/org/bigbluebutton/lib/main/models/UserSession.as

...cript/org/bigbluebutton/lib/main/services/EnterService.as