Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/domain/eshop/Producer.groovy
	grails-app/views/producer/list.gsp