Merge branch 'master' of github.com:Sereger/project1test

Conflicts:
	app/models/Product.php