-revert
Merge remote-tracking branch 'origin/master'

Conflicts:
	data/hsql/common/db.properties
	data/hsql/common/db.script
	data/hsql/level/levelDB.properties
-revert