Merge branch 'develop' into feature-atmospheres
basic atmoshperic implementation
Merge branch 'feature-atmospheres' into develop