Merge origin/master

Conflicts:
	src/java/database/TermParaDB.java
Merge origin/master

Conflicts:
	src/java/database/TermParaDB.java