Merge remote-tracking branch 'gitup/groupfinding_module' into groupfinding_module

# Conflicts:
#	gemeinsamforschen/src/main/java/unipotsdam/gf/config/GFRocketChatConfig.java
#	gemeinsamforschen/src/main/java/unipotsdam/gf/taglibs/ChatWindow.java