Added evaluation view
Merged changes into evaluation branches
Merge branch 'master' into evaluation
Merge branch 'master' into evaluation
Merge pull request #1 from simensma/evaluation

Evaluation