liens
merg
Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	app/config/parameters.yml
	src/web3tc/EchangeBundle/Resources/views/Echange/index.html.twig