Merge branch 'master' of github.com:estay/estay_ecs

Conflicts:
	We7.CMS.Web/Hotel/10005.shtml