Conflicts:
	assets/js/co.js
	assets/js/default/directory.js
	assets/js/default/formInMap.js
	assets/js/default/loginRegister.js
	assets/js/menus/multiscopes.js
	assets/js/sig/map_popupContent.js
	components/CommunecterController.php
	config/CO2/params.json
	controllers/DatamigrationController.php
	controllers/ElementController.php
	docs/roadmap.org
	views/default/directoryjs.php
	views/default/index.php