Merge branch 'hotfix/2.0.7.1' into Development
Datefixes and Archivefixes. NHP_archive.ss is no longer needed this way.
Merge branch 'release/2.0.8'