Merge remote-tracking branch 'bigbluebutton/master' into mobile-conversations

...rc/main/java/jnlp/sample/servlet/JnlpDownloadServlet.java

...pp/src/main/java/jnlp/sample/servlet/JnlpFileHandler.java

...pp/src/main/java/jnlp/sample/servlet/ResourceCatalog.java

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

clients/flash/air-client/src/Main.mxml

clients/flash/air-client/src/css/ColorPalette.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

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

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

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

...lient/src/org/bigbluebutton/air/common/views/VideoView.as

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

...src/org/bigbluebutton/air/main/commands/ConnectCommand.as

...t/src/org/bigbluebutton/air/main/commands/EmojiCommand.as

...nt/src/org/bigbluebutton/air/main/commands/EmojiSignal.as

...rc/org/bigbluebutton/air/main/commands/GoToSlideSignal.as

...ent/src/org/bigbluebutton/air/main/models/IUserSession.as

...ient/src/org/bigbluebutton/air/main/models/UserSession.as