terms and conditions
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/i18n/messages.properties