modif
Merge branch 'Naty' into Clélia

Conflicts:
	MVC/js/main_Clelia.js