rien
merge
Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	nbproject/private/private.xml
	src/web3tc/EchangeBundle/Resources/views/Echange/carteSpe.html.twig
merge
Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	app/Resources/views/base.html.twig