Merge remote-tracking branch 'upstream/master' into increase-button-sizes

akka-bbb-apps/src/main/resources/application.conf

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala

.../core/apps/users/UserInactivityAuditResponseMsgHdlr.scala

...rc/main/scala/org/bigbluebutton/core/models/Users2x.scala

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala

...rg/bigbluebutton/client/meeting/AllowedMessageNames.scala

.../main/scala/org/bigbluebutton/common2/msgs/UsersMgs.scala

bigbluebutton-client/locale/en_US/bbbResources.properties

...tton-client/src/org/bigbluebutton/main/events/BBBEvent.as

...ent/src/org/bigbluebutton/main/model/users/UserService.as

...ent/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml

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

...g/bigbluebutton/main/views/UserInactivityAuditWindow.mxml

...g/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml

...g/bigbluebutton/modules/users/services/MessageReceiver.as

...org/bigbluebutton/modules/users/services/MessageSender.as

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

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

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