fix NPE when querying for related objects
reorder entries in manifest to fix error
clean up unused method
Merge branch 'master' of github.com:eecsninja/partyview
Merge branch 'master' of github.com:eecsninja/partyview
update markers when other users change location