upd
Merge branch 'master' of https://github.com/Florry/Rest-App

Conflicts:
	app/controllers/Products.java
updated