Optimize using batch of statements
Merge branch 'wip/db-jdbc' into wip/db-jdbc-location-update

Conflicts:
	db/Database.java