Merge branch 'development_master' of...

Merge branch 'development_master' of https://gitup.uni-potsdam.de/dehne/fltrail into groupfinding_module

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFApplicationBinder.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/Project.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/project/ProjectView.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/ProjectCreationProcess.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/tasks/TaskDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/session/SessionExistsFilter.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java
#	gemeinsamforschen/src/main/webapp/profile/profile.jsp
#	gemeinsamforschen/src/main/webapp/project/js/create-project.js
#	gemeinsamforschen/src/main/webapp/project/overview-student.jsp
#	gemeinsamforschen/src/main/webapp/project/tasks-docent.jsp
#	gemeinsamforschen/src/main/webapp/project/tasks-student.jsp
#	gemeinsamforschen/src/scripts/dbschema/createDummyUsersGroupsProject.sql
#	gemeinsamforschen/src/test/resources/database/fltrail.sql