Database system module and numbercompare assertion
clean up
Merge branch 'master' of https://github.com/itaiag/integ-framework

Conflicts:
	integ-db/pom.xml