First changes to history tab, dateTime and elapsedTime working
Merge branch 'jelle' of https://github.com/khamkham/crowd-watson into jelle
Merging arne done, getFromJSON complete etc
Morning 30-1
Merge branch 'master' into jelle
Merge done and templateting almost complete
Merge branch 'arne' into jelle
Template finished, except for the missing vars
Merge branch 'jelle'