fix
Merge branch 'staging' of github.com:finleyltf/FusionSquare into staging

merge