Merge branch 'hotfix'
Merge branch 'hotfix'
Merge branch 'hotfix'
Merge branch 'hotfix'
Fix #487 submission for simple evaluation is not stored correctly

The variables were incorrectly used. Might be copy/paste from somewhere
else.
Bump version to 3.0.4
Merge branch 'hotfix-487' into dev

Conflicts:
	app/controllers/components/evaluation.php