show
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/DD/ShopBundle/Tests/Controller/ResourceControllerTest.php
Merge remote-tracking branch 'origin/master'
show