layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/controllers/eshop/SiteController.groovy
	grails-app/i18n/messages.properties
	grails-app/services/eshop/ProductService.groovy
	grails-app/views/layouts/site.gsp
	grails-app/views/site/common/_productCarousel.gsp
	grails-app/views/site/common/_productGrid.gsp
	grails-app/views/site/common/_productThumbnail.gsp
	web-app/css/zanbil.css
	web-app/js/common.js