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

Conflicts:
	MVC/index.html
	MVC/nbproject/private/private.xml
	nbproject/project.xml
proxyCHANGE
Merge branch 'Fabrizio'
Merge branch 'Fabrizio'
sdf

fdsa
Merge branch 'Fabrizio'
dfsa

fads
Merge branch 'Fabrizio'