Trades
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/migrations/changelog.groovy
	grails-app/views/account/_form.gsp
	grails-app/views/account/list.gsp
	grails-app/views/account/show.gsp
Fix up user journey when registering