Merge branch 'master' of https://github.com/PNMJ/nudge

Conflicts:
	app/Controller/Component/ProductManagerComponent.php
Merge branch 'master' of https://github.com/PNMJ/nudge

Conflicts:
	app/Controller/Component/ProductManagerComponent.php