# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java
#	gemeinsamforschen/src/main/webapp/groupfinding/create-groups-manual.jsp
#	gemeinsamforschen/src/main/webapp/groupfinding/css/edit-groups.css
#	gemeinsamforschen/src/main/webapp/groupfinding/edit-groups.jsp
#	gemeinsamforschen/src/main/webapp/groupfinding/js/create-groups-manual.js
#	gemeinsamforschen/src/main/webapp/groupfinding/js/edit-groups.js