Merge origin/master

Conflicts:
	src/java/database/TermeDB.java