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

bbb-lti/grails-app/controllers/ToolController.groovy

bbb-lti/grails-app/services/BigbluebuttonService.groovy

bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java

.../org/bigbluebutton/modules/phone/managers/PhoneManager.as

...igbluebutton/modules/users/business/ListenersSOService.as

bigbluebutton-config/bin/bbb-conf