Merged Changes - Added map to Map activity.
Merge pull request #1 from cwardcode/master

Merged Changes - Added map to Map activity.