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

Conflicts:
	src/web3tc/EchangeBundle/Controller/EchangeController.php
	src/web3tc/EchangeBundle/Entity/UniversiteRepository.php