Merge branch 'map'
Merge branch 'master' of github.com:rezaprogrammer/sample-android-app1