Merge branch 'master' into merge-polling-with-master

bbb-lti/application.properties

bbb-lti/grails-app/conf/ApplicationResources.groovy

bbb-lti/grails-app/conf/BootStrap.groovy

bbb-lti/grails-app/conf/BuildConfig.groovy

bbb-lti/grails-app/conf/Config.groovy

bbb-lti/grails-app/conf/DataSource.groovy

bbb-lti/grails-app/conf/UrlMappings.groovy

bbb-lti/grails-app/conf/lti.properties

bbb-lti/grails-app/conf/spring/resources.groovy

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

bbb-lti/grails-app/i18n/messages.properties

bbb-lti/grails-app/i18n/messages_es.properties

bbb-lti/grails-app/i18n/messages_fr.properties

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

bbb-lti/grails-app/views/error.gsp

bbb-lti/grails-app/views/index.gsp

bbb-lti/grails-app/views/layouts/main.gsp

bbb-lti/grails-app/views/layouts/main_old.gsp

bbb-lti/grails-app/views/tool/error.gsp

bbb-lti/grails-app/views/tool/index.gsp