Remove dummy service and fixed warnings
Refactoring of the Map User Overlay
Merge branch 'master' of github.com:bladenight/bladenightapp-android
Fixed bug that caused friend marker to never reappear once disappeared