Revert "Merge branch 'develop-js' into develop"

This reverts commit 8af93f875b03522d5bc2eb775e2c2aea19726e57, reversing
changes made to 44e8b108fff47da23cd674522092cd5703e17251.

Conflicts:
	config/locales/views/students/de.yml
Merge remote-tracking branch 'origin/develop-fix' into develop-ak
merged missing commits back into game. yeah