fixed redirects
Merge branch 'master' into ui

Conflicts:
	apps/frontend/modules/subjects/templates/createNewSuccess.php
fixed heading
Merge branch 'ui'