Revert "Revert "Updated activities to add google map functionality""

This reverts commit e290b8eaff74e5e97a6e52e7c00a46a7cd099a7b.