xxx
Merge branch 'master' of https://github.com/yandizheng/prototype.git

Conflicts:
	SalesMembershipsScheduler/SalesMembershipsScheduler/Scheduler/login.aspx.cs
	SalesMemeberships/ZRHMemberships/Base/WebInitializer.cs
	SalesMemeberships/ZRHMemberships/Config/CommonSetting.config
	SalesMemeberships/ZRHMemberships/Global.asax.cs
	SalesMemeberships/ZRHMemberships/Left.aspx.cs
	SalesMemeberships/ZRHMemberships/Main.aspx.cs
	SalesMemeberships/ZRHMemberships/RandomNumber.aspx.designer.cs
	SalesMemeberships/ZRHMemberships/Right.aspx.cs
	SalesMemeberships/ZRHMemberships/SystemModule/UserRoleList.aspx.designer.cs
	SalesMemeberships/ZRHMemberships/UserControl/HeadUserControl.ascx.cs
	SalesMemeberships/ZRHMemberships/Web.config
Merge branch 'master' of https://github.com/yandizheng/prototype.git
Ruby Init Db
Merge branch 'master' of https://github.com/yandizheng/prototype.git