envoi
cnflict
Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	src/web3tc/EchangeBundle/Resources/views/Echange/index.html.twig
	src/web3tc/EchangeBundle/Resources/views/Echange/pays.html.twig