Merge origin/master

Conflicts:
	src/db/ManilleDB.java