Tests modified
DataFixtures modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/webconsOLE/ShopBundle/Tests/Controller/ProductControllerTest.php