baobiao
baobiao2
Merge branch 'master' of https://github.com/phiree/testttt

Conflicts:
	AdminWeb/Manager/QuZhouSpring/CancelTa.aspx
	AdminWeb/tourolAdminLog/logfile.txt