Ajout webservice Objet
Initialisation du repo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	nbproject/genfiles.properties
	nbproject/project.properties