Made some changes to the interface and java code
Merge branch 'master' into javainterface
Testing cardinality
Uncommented code
Added cardinality view
Merge branch 'master' of github.com:mitdbg/seedb

Conflicts:
	SeeDB-java-backend/src/views/CardinalityView.java