Added map view
Merge changes, still need to fix stuff
Merging fixes
fixed activity and added to gitignore
Fixed after gitignore changes