Module
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge branch 'master' of github.com:philhecht/Module_OXID_EShop_ShopLocator

Conflicts:
	README.md
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Comment delete