modification diverse
Modification diverse (adaptation conflit)

Merge branch 'master' of https://github.com/Tiger76/CCIcommunityPrj

Conflicts:
	src/CCICommunity/AnnoncesBundle/Resources/views/Default/evenement_list.html.twig