Added all kinds of Map Annotation stuff.
Merge remote-tracking branch 'origin/master'