Merge branch 'refs/heads/master' into feature/black_ice
Merge conflict
First tests with generating ice surface
Finished black ice experiment
Release build
Merge branch 'refs/heads/feature/black_ice' into develop
Merge branch 'refs/heads/develop'