merged with user view changes from razvan
Merge branch 'master' of github.com:alecspopa/eval.ninja
WIP