Merge branch 'master' of https://github.com/srmo642002/Eshop

Conflicts:
	application.properties
	grails-app/conf/Config.groovy