Evaluation changes

Changed evaluation, final prototype and demo link
Merge branch 'master' of https://github.com/hci2014/sandbox