recup
com
Merge branches 'master' and 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	src/web3tc/EchangeBundle/Resources/views/Echange/ajoutContratEtude2.html.twig
pull
Merge branch 'master' of https://github.com/SalmaF/Symfony2

Conflicts:
	src/web3tc/EchangeBundle/Resources/views/Echange/ajoutContratEtude2.html.twig
cours_ce
conflict
Merge branch 'master' of https://github.com/SalmaF/Symfony2

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