Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton

bbb-api-demo/src/main/webapp/bbb_api.jsp

bigbluebutton-client/locale/en_US/bbbResources.properties

bigbluebutton-client/resources/prod/lib/bbb_blinker.js

bigbluebutton-client/src/BigBlueButton.mxml

...client/src/org/bigbluebutton/main/events/ShortcutEvent.as

...src/org/bigbluebutton/main/model/modules/ModuleManager.as

...ient/src/org/bigbluebutton/main/model/users/Conference.as

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

.../src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml

...nt/src/org/bigbluebutton/modules/chat/views/ChatView.mxml

...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml

...rg/bigbluebutton/modules/videoconf/business/VideoProxy.as

...igbluebutton/modules/videoconf/business/VideoWindowItf.as

...g/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml

...luebutton/modules/videoconf/maps/VideoEventMapDelegate.as

...g/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml

.../bigbluebutton/modules/videoconf/views/PublishWindow.mxml

...rg/bigbluebutton/modules/videoconf/views/VideoWindow.mxml

.../org/bigbluebutton/modules/videodock/views/VideoDock.mxml

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