Fix merge error
Merge branch 'release'

Our "start release" job failed because master could not be merged into
release with --ff-only. When I compared the two branches

https://github.com/OpenTreeMap/OTM2/compare/master...release

This single commit showed up: 40e936aa0ad4fb6124112f895522a57243badaf6A

This commit is identical to one on the master branch:
0bc6f075c62dc5b894a3184923d4843c8c872a81

Merging release back into master will be a noop.
Update mapState module to support the modeling app.
Fix slider widths defaulting to 100px on page load.
Merge pull request #1579 from kdeloach/topic/modeling-view

Update navbar links in instance_base template