Merge remote-tracking branch 'origin/development_master' into Journal

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/database/mysql/MysqlConnect.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/journal/model/Journal.java