新版本

登录注册写信收信
Merge branch 'master' of https://github.com/Jopix/dotnet

Conflicts:
	CMS/Web.config
	Ninesky.v11.suo

	modified:   CMS/Web.config