Fixed map markers
Fixed discussions/bulletins fragment hiding when moving to map
Merge branch 'master' of https://github.com/BrennaBlackwell/spARK.git