JSON and location Annotations now working

Map annotations now coming from JSON