Merge branch 'master' into feature/bird1204
full screen map view
Merge branch 'feature/bird1204'