Add webservices
avancement upload promotion
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	composer.lock
	src/Harpaga/FrontendBundle/Entity/Promotion.php
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	src/Harpaga/ApiBundle/Handler/CommerceHandler.php
	src/Harpaga/ApiBundle/Resources/config/routing.yml
	src/Harpaga/FrontendBundle/Entity/Promotion.php
correction pb