navi icon fix/ googlemaps scroll disable
Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging