Add support for tablesorter
fix conflict in index.scala
Merge branch 'develop' of https://github.com/johanbrook/dat076-webapps into develop