Merged branch 'server/feat/jaxrsparser'
Updated pom.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/pom.xml