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

# 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

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

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/model/Assessment.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/service/FBAssessement.java

# Conflicts:
#	.gitignore

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

email have to be unique, because it identifies a user

feat: add update for user database entry

adding .idea folder to .gitignore for each subproject, because it's only folder for IDE configuration

It only contains IDE configuration which shouldn't be in a repository

It only contains IDE settings which shouldn't be in source control anyway