Pull de merde pour le composer.lock de Dudu !!!
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
Système de catégories admin
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	bin/doctrine
	bin/doctrine.php
	src/Harpaga/FrontendBundle/Entity/Promotion.php
	web/harpaga/frontend/css/frontend-style.css
	web/harpaga/user/js/functions.js
Production
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
La fin du hackathon !!