update changement de langue et suppression emplacement
fix conflict
Merge branch 'master' of https://github.com/omegas27/CAeSAR

Conflicts:
	src/Caesar/ResourceBundle/Entity/Resource.php
iteration1