Merge origin/master

Conflicts:
	src/java/database/ConnectionMysql.java
	src/java/database/TermeBD.java