Add map activity
Edit map class
fix mapview
Merge branch 'master' into map
add Map image in the main activity