fix stupid bugs
Merge branch 'master' of github.com:mitdbg/seedb

Conflicts:
	SeeDB-java-backend/src/test/SeeDBTest.java