Fixed minor compile errors
Updating ParseJSON/DBFunctions
Fix inconsistency in the pom
Merge branch 'json' into features/json-server-jetty-plus-json

Conflicts:
	src/routemaster/jrm/ParseJSON.java