update
update
Merge branch 'feature/AppHotADPlus' into develop
update
update
update
update
update
update
Merge branch 'develop' into feature/PriceInDay

Conflicts:
	Doc/README/Wap 站点接口说明.docx
	Doc/README/changelog.docx
	MvcInerfaceDemo/MvcInerfaceDemo/MvcInerfaceDemo.csproj
	MvcInerfaceDemo/MvcInerfaceDemo/MvcInerfaceDemo.csproj.user
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer15.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer16.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer17.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer18.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer2.wsdl
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer21.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer23.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer24.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer25.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer26.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer27.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/MyMobileServer28.xsd
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/Reference.cs
	MvcInerfaceDemo/MvcInerfaceDemo/Service References/productionServiceRef/Reference.svcmap
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/estay_ecs.edmx
	WcfServiceMobileInterface/MobileInter.DAO/Models/estay_ecs/order_info.cs
	WcfServiceMobileInterface/MobileInter.Servers/MobileInter.Servers.csproj
	WcfServiceMobileInterface/MobileInter.Servers/Services/estay_ecs_Services/HouseServices/HouseServices.cs