Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/vendor/create.gsp
Merge remote-tracking branch 'origin/master'