Merge branch 'Naty' into Clélia
MergeNatiEvent&Artist
Merge branch 'Naty' into Clélia
Merge branch 'Naty' into Clélia
fd
Merge branch 'Naty' into Clélia
Merge branch 'Naty' into Clélia
commitNav
Merge branch 'Naty' into Clélia
Merge branch 'Naty' into Clélia

Conflicts:
	MVC/js/main_Clelia.js
Merge branch 'Clélia' into Naty

Conflicts:
	MVC/index.html