# Conflicts:
#	gemeinsamforschen/src/main/webapp/assets/js/overview-docent.js
#	gemeinsamforschen/src/main/webapp/pages/project-docent.jsp