# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IPeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/PeerAssessmentDummy.java
#	gemeinsamforschen/src/main/webapp/core/pages/gemeinsamForschen.tld
#	gemeinsamforschen/src/scripts/dbschema/fltrail.sql

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

feat: workRating for peers are written to DB
feat: 2 new tables in DB

feat: creating Quizzes in the DB possible

# Conflicts:
#	gemeinsamforschen/src/scripts/dbschema/fltrail.sql

It is necessary to hide the button if the comment text is to long