test
View（Chat&Login）
Class User
Merge branch 'Shen'
Merge branch 'master' of https://github.com/WeChatter/WeChatter

Conflicts:
	WeChatter/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.obj
	WeChatter/Debug/AssemblyInfo.obj
	WeChatter/Debug/CL.read.1.tlog
	WeChatter/Debug/CL.write.1.tlog
	WeChatter/Debug/WeChatter.exe
	WeChatter/Debug/WeChatter.lastbuildstate
	WeChatter/Debug/WeChatter.log
	WeChatter/Debug/WeChatter.obj
	WeChatter/Debug/WeChatter.pch
	WeChatter/Debug/WeChatter.pdb
	WeChatter/Debug/WeChatter.vcxproj.GenerateResource.Cache
	WeChatter/Debug/WeChatter.vcxprojResolveAssemblyReference.cache
	WeChatter/Debug/cl.command.1.tlog
	WeChatter/Debug/link.command.1.tlog
	WeChatter/Debug/link.read.1.tlog
	WeChatter/Debug/link.write.1.tlog
	WeChatter/Debug/mt.command.1.tlog
	WeChatter/Debug/mt.read.1.tlog
	WeChatter/Debug/mt.write.1.tlog
	WeChatter/Debug/rc.command.1.tlog
	WeChatter/Debug/rc.read.1.tlog
	WeChatter/Debug/rc.write.1.tlog
	WeChatter/Debug/stdafx.obj
	WeChatter/Debug/vc100.pdb
	WeChatter/WeChatter.cpp
	WeChatter/WeChatter.sdf
	WeChatter/WeChatter.suo
	WeChatter/WeChatter.vcxproj
	WeChatter/WeChatter.vcxproj.filters