creation LivreService
auto merge
merge workspace.xml

Merge branch 'master' of github.com:JohanD9/PROJET_JEE

Conflicts:
	BiblioJ/.idea/workspace.xml
am