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

bbb-api-demo/README

bbb-api-demo/WebContent/Demo123.pdf

bbb-api-demo/WebContent/Demo456.pdf

bbb-api-demo/WebContent/Demo789.pdf

bbb-api-demo/WebContent/META-INF/MANIFEST.MF

bbb-api-demo/WebContent/ReadMe.txt

bbb-api-demo/WebContent/WEB-INF/lib/commons-codec-1.5.jar

...-demo/WebContent/WEB-INF/lib/commons-fileupload-1.2.2.jar

bbb-api-demo/WebContent/WEB-INF/lib/commons-io-2.0.1.jar

bbb-api-demo/WebContent/WEB-INF/web.xml

bbb-api-demo/WebContent/demo_header.jsp

bbb-api-demo/build.gradle

bbb-api-demo/build.xml

bbb-api-demo/build/.gitignore

bbb-api-demo/dist/.gitignore

bbb-api-demo/pom.xml

bbb-api-demo/src/main/webapp/WEB-INF/web.xml

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

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

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