aaaaa
Merge branch 'master' of github.com:Kjubo/luckysign

Conflicts:
	AppBll/QA/QA_QuestionBll.cs
	AppBll/User/USR_SMSBll.cs
	PPLive/Astro/AstroBiz.cs
	PPLive/Astro/AstroMod.cs
	PPLive/BaZi/BaZiMod.cs
	PPLive/DateEntity.cs
	PPLive/PublicDeal.cs
	PPLive/ZiWei/ZiWeiBiz.cs
	PPLive/ZiWei/ZiWeiMod.cs
	WebForApps/AstroDice/IndexForWap.aspx
	WebForApps/AstroDice/IndexForWap.aspx.cs
	WebForApps/AstroDice/IndexForWap.aspx.designer.cs
	WebForApps/AstroDice/RecievePic.aspx
	WebForApps/AstroDice/RecievePic.aspx.designer.cs
	WebForApps/LoveRose/Count.aspx.cs
	WebForApps/LoveRose/IndexForQQ.aspx.cs
	WebForApps/Venus/IndexForQQt.aspx.cs
	WebForApps/WebForApps.csproj
	WebForMain/ControlLibrary/AstroForQuest.ascx.cs
	WebForMain/PPLive/AstroChart.aspx.cs
	WebForMain/PPLive/BaZiChart.aspx.cs
	WebServiceForApp/Interface/ICustomerService.cs
	WebServiceForApp/Service/CustomerService.cs
	WebServiceForApp/Service/InputService.cs
	WebServiceForApp/Service/PPLiveService.cs
	WebServiceForApp/Service/QAService.cs