Users displaying on map
Fix? merge conflicts
Merge branch 'nManos'