# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupfindingImpl.java
#	gemeinsamforschen/src/test/java/unipotsdam/gf/process/tasks/GroupPhaseTaskTest.java
#	gemeinsamforschen/src/test/resources/database/fltrail.sql