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

Conflicts:
	View/header.php
Merge branch 'release/v0.4.15'
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
now notes are always displayed at least once, basically viewing them is treated like answering any other item
added support for JS evaluated showif, closes #8, #4
Merge branch 'release/v0.4.17'

Conflicts:
	documentation/Example files/training_diary.xlsx
rm console log
Merge branch 'hotfix/forgot_to_remove_console_log' into develop