ProductController war nicht ganz korrekt
Merge remote-tracking branch 'origin/master'

Conflicts:
	controllers/ProductController.php
Bug fixed