commit of experimental settings
Merge branch 'master' of https://github.com/mitdbg/seedb

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