Switch to tablesorter
Adjusted gitignore
Merge branch 'develop'