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
delete naty main
new
Img

Changement des images
mod
fick
dasda
Merge remote-tracking branch 'origin/Fabrizio' into Naty
div add event
modif