Added map activity
Merged changes
Added map to home screen