Added multiple annotations. Bugs: user location is now an annotation; user location isn't constantly updated, so animation only occurs at the initial map load.
Merge remote-tracking branch 'origin'