Merge branch 'PeerAssessmentChristian' of C:\Users\Christian\Desktop\FInalGit\fltrail with conflicts.

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/user/UserService.java
#	gemeinsamforschen/src/main/webapp/pages/overview-docent.html
#	gemeinsamforschen/src/main/webapp/pages/overview-student.html

fix: userToken was not written to url during login

html mutates to jsp step by step. first step

chore: adding todos

next method returns false, if it is on the end of the list

fix: fix naming for Project active
feat: implement getUserByField/getUserByEmail/getProjectById
refactor: camelcase for adminPassword

feat: add update for user database entry

fix: post request works in /calculate and Grades was exchanged by ArrayList(Grading), whoop uhm.. whoop!

The AnnotationController handles the database queries

test: adding unit tests for endpoints

fix: ExampleFeedback

feat: ExampleFeedback
feat: Enum Category