Added route id, changed route query
Merge branch 'features/json-server-jetty-plus-json' of github.com:routemaster/routemaster-backend into features/json-server-jetty-plus-json

Conflicts:
	src/routemaster/jrm/DBFunctions.java