cleanup

Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
cleanup