Merge remote-tracking branch 'origin/develop' into develop-ja

Conflicts:
	config/locales/views/students/de.yml
	config/locales/views/students/en.yml