Product details
Product details controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Warsztaty/FilterBundle/Resources/views/Default/list.html.twig
Details view
Merge remote-tracking branch 'origin/master'