Begin servlet
Servlet Bibliothecaire issue
Merge remote-tracking branch 'origin/Servlet'

Conflicts:
	.gitignore