Progress on sorting by clicking on columns.
Merge branch 'master' of https://github.com/ldevesine/Calvin into john_dev
Added a custom ArtHandler so we can do our own icon files in a nice way.
Minor bugfix with the new icons.
re-add graphing button, icon updates
Merge branch 'graphing'