Jackson sample using servlet
Merge origin/master

Conflicts:
	POC_Project/pom.xml