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

Conflicts:
	grails-app/views/invitation/contacts.gsp
	grails-app/views/invitation/pick.gsp
	grails-app/views/invitation/sent.gsp
	grails-app/views/layouts/main.gsp
	grails-app/views/newsLetter/_form.gsp