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

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

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

bigbluebutton-client/build.xml

bigbluebutton-client/resources/prod/check/bbb-check.html

bigbluebutton-client/resources/prod/check/lib/bbb_check.js

...utton-client/resources/prod/check/lib/pre_flight_check.js

bigbluebutton-client/src/CameraCheck.mxml

bigbluebutton-client/src/MicrophoneCheck.mxml

...bigbluebutton/modules/videoconf/views/ControlButtons.mxml