Merge branch 'hotfix/forgot_ace_cdn' into develop
Merge branch 'release/v0.4.15' into develop

Conflicts:
	View/header.php
remove leftover function
prevent accidental deletion via enter key
fixes #46
closes #40
also warns about missing choices now, see #47
fix problems with new lines in R and make ace more flexible
show only user's studies in run dialog
improve ace binding
training_diary changes
Merge branch 'release/v0.4.16'

Conflicts:
	View/header.php