Fixed gits merge screw up!
	modified:   Database.java