Merge origin/master

Conflicts:
	src/Uniiti/CommonBundle/EntityRepository/ShopRepository.php
Merge origin/master

Conflicts:
	.gitignore
	README.md