- upgrade bigbluebutton-web to grails 2.3.6 (bigbluebutton/bigbluebutton@6cf30e9f076466fdb35e307bcd5326dd0b6ace42)

Conflicts:
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/resources.xml