fixed #58
Merge branch 'bug/58-npe-cancel-download' into dev
Merge branch 'dev' of github.com:cismet/cismap-commons into dev