modified:   SubmitClassroomwork.Webkit/SubmitClassroomwork.Webkit.v11.suo
	modified:   SubmitClassroomwork.Webkit/Webkit/UserControl/UIUserInfo.ascx
	modified:   SubmitClassroomwork.Webkit/Webkit/UserControl/UIUserInfo.ascx.cs
	modified:   SubmitClassroomwork.Webkit/Webkit/UserControl/UIUserInfo.ascx.designer.cs
	modified:   SubmitClassroomwork.Webkit/Webkit/Webkit.csproj
	SubmitClassroomwork.Webkit/Webkit/Manage/
	new file:   SubmitClassroomwork.Webkit/Webkit/Manage/User_Add.aspx
	new file:   SubmitClassroomwork.Webkit/Webkit/Manage/User_Add.aspx.cs
	new file:   SubmitClassroomwork.Webkit/Webkit/Manage/User_Add.aspx.designer.cs
Merge branch 'master' of https://github.com/mywanqi/SubmitClassroomwork

Conflicts:
	SubmitClassroomwork.Webkit/SubmitClassroomwork.Webkit.v11.suo
	SubmitClassroomwork.Webkit/Webkit/bin/SCW.BLL.dll
	SubmitClassroomwork.Webkit/Webkit/bin/SCW.Model.dll
	SubmitClassroomwork.Webkit/Webkit/bin/WQ.Common.dll
	SubmitClassroomwork.Webkit/Webkit/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache