# Conflicts:
#	.idea/workspace.xml

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

With this a profile page is added to the side menu

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/Menu.java

fix: path for quizzes done. almost assessment path done

# Conflicts:
#	gemeinsamforschen/src/main/webapp/pages/project-student.jsp

before:
project-student.js --> givefeedback.jsp
now:
project-student.js --> annotation-document.jsp --> givefeedback.jsp