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

Conflicts:
	src/web3tc/EchangeBundle/Controller/EchangeController.php
conflict
Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	app/config/parameters.yml
	nbproject/private/private.xml
	src/web3tc/EchangeBundle/Entity/ContratEtude.php
	src/web3tc/EchangeBundle/Resources/views/Echange/listeContrats.html.twig