übernommen
merged
ydefrvadfgb
Merge branch 'master' of https://github.com/o7contra/WebInfSys.git

Conflicts:
	grails-app/views/shop/index.gsp