-added map
Merge branch 'master' of https://github.com/satolyte/veritours

Conflicts:

Veritours4.xcodeproj/project.xcworkspace/xcuserdata/Yuan.xcuserdatad/Use
rInterfaceState.xcuserstate