change enums to strings
nav style auctions
Merge branch 'master' of https://github.com/sheepers/sheepers_dev

Conflicts:
	grails-app/conf/ApplicationResources.groovy