test
Merge branch 'master' of https://github.com/white-cap/helmasfront into zo2

Conflicts:
	app/Controller/MarchandsController.php
Merge pull request #3 from white-cap/zo2

Zo2