Merged Changes - Added map to Map activity.