update
update
Add .gitignore
Merge branch 'master' of https://github.com/tonibuenter/RemoteQuery

Conflicts:
	RemoteQuery/java/org/remotequery/RemoteQueryServlet.java