Changed shutdownhook
Merge with lovis
Merge branch 'master' of github.com:scanniza/DesktopHipster