Ajout Util Log XML
MAJ UtilFTP (gestion proxy)
Merge origin/master
Test
Test
Merge origin/master

Conflicts:
	Campus/nbproject/project.properties