Annotations Commit 1

Added the base for the annotations in the map view.
Merge pull request #2 from mshamash/master

Annotations Commit 1