Adding JSON/P support for error messages.
Merge branch 'master' of https://github.com/KevinOrtman/tsquery

Conflicts:
	src/net/tsquery/TsdbServlet.java