fix bug 2014-1-10
Merge branch 'master' of https://github.com/18301551026/tour.git