modification des entité promotion pour inclure jointure
ok Merge branch 'master' of https://github.com/Harpaga/harpagaproject

Conflicts:
	app/cache/dev/appDevDebugProjectContainer.php
	app/cache/dev/appDevDebugProjectContainer.xml
	app/logs/dev.log