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

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

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

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

bigbluebutton-web/grails-app/conf/spring/resources.xml

...b/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java

...skshare/server/socket/BlockStreamEventMessageHandler.java