Merge remote-tracking branch 'bigbluebutton/master' into speedup-getrecordings

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

...witch/esl/client/internal/debug/ChannelEventRunnable.java

...reeswitch/esl/client/internal/debug/ExecutionHandler.java

bigbluebutton-client/locale/en_US/bbbResources.properties

...nt/src/org/bigbluebutton/modules/users/views/EmojiGrid.as

bigbluebutton-html5/app/client/globals.js

bigbluebutton-html5/app/client/lib/bbb_api_bridge.js

bigbluebutton-html5/app/client/main.js

bigbluebutton-html5/app/client/views/whiteboard/slide.js

...luebutton-html5/app/client/views/whiteboard/whiteboard.js

bigbluebutton-html5/app/client/whiteboard_models/utils.js

...-html5/app/client/whiteboard_models/whiteboard_ellipse.js

...on-html5/app/client/whiteboard_models/whiteboard_paper.js

...ton-html5/app/client/whiteboard_models/whiteboard_text.js

bigbluebutton-html5/app/server/collection_methods/slides.js

bigbluebutton-html5/app/server/server.js