Merge branch 'develop' into release-4.8
Merge branch 'release-4.8' into staging
fixed frozen hash bug with report calculations
Merge branch 'release-4.8' into staging
Fixed 2 mission associations