Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	app/config/parameters.yml.dist
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
Merge branch 'master' of https://github.com/Harpaga/harpagaproject
Pull
Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	src/Harpaga/FrontendBundle/Controller/PromotionController.php
	src/Harpaga/FrontendBundle/Repository/PromotionRepository.php
	src/Harpaga/UserBundle/Form/Type/RegistrationCommerceFormType.php