fixed correctOrderingOfAllAnnotations so that user location is over shapes but under markers