no message
merge
Merge branch 'master' of https://github.com/ChinaPicture/DLTourOfJapan

Conflicts:

DLTourOfJapan/DLTourOfJapan.xcodeproj/project.xcworkspace/xcuserdata/dev
eloper.xcuserdatad/UserInterfaceState.xcuserstate
ss

ss