Merge remote-tracking branch 'origin/HenrikValidation' into Lars1.5

Conflicts:
	public/views/partial-register-answer.html
mess in merging
new test scenarios
fix conflict
commented out db-entries test
fixing conflict
Merge remote-tracking branch 'origin/master'