paper
query proc
Merge branch 'master' of github.com:mitdbg/seedb

Conflicts:
	SeeDB-java-backend/src/core/QueryProcessor.java