Merge branch 'development' into development_marc
fixes #166
fixes #166 when losing connection in DownloadMenu
Merge branch 'development_marc' into development