Updated class path.
Added json type to echo.
Merge branch 'master' of workvm:/home/david/src/GenericServer

Conflicts:
	src/make_jar.sh