RegisterAndLogin
Register
RegisterAdd
Merge remote-tracking branch 'origin/master'

Conflicts:
	Training.CMS/Training.CMS.Sql/Training.CMS.Sql.publish.xml
	Training.CMS/Training.Data/IUserStore.cs
	Training.CMS/Training.Data/StoreFactory.cs
	Training.CMS/Training.Data/UserStore.cs
	Training.CMS/Training.Service/IUserService.cs
	Training.CMS/Training.Service/Training.Service.csproj
	Training.CMS/Training.Web/Login.aspx
	Training.CMS/Training.Web/Login.aspx.cs
	Training.CMS/Training.Web/Training.Web.csproj
	Training.CMS/Training.Web/Web.config
Merge branch 'master' of https://github.com/Cindywang2014/TrainingCMS.git