d
Merge remote-tracking branch 'origin/master' into Romain

Conflicts:
	MVC/index.html
	MVC/nbproject/private/private.xml
	nbproject/project.xml
proxyCHANGE
VARIABLESOKWITHIT
myExtendModelChange
DELETE_nbProjects_caduc
dispatchFile
dispatchBIS
LAST
BIGrefresh
INSTANCE_IN_PLACEv1.0
Merge remote-tracking branch 'origin/Romain' into Naty

Conflicts:
	MMReadyDesign/nbproject/project.xml
	MVC/index.html
	MVC/js/main_Clelia.js
	MVC/js/main_Naty.js