use zPosition to re-order map markers
remove deprecated block style UIView animation
fix styling of if-else brackets in viewForAnnotation