JSON api working :)
Merge branch 'master' of https://github.com/driz764/ept-server

Conflicts:
	src/main/java/com/ept/web/JettyServer.java