+ adjusted video scale mode
+ swapped to hybrid map style
Merge branch 'develop-CNS' of github.com:cyclestreets/ios into develop-CNS