会话广场完成
修改

Conflicts:
	KnowIsKnow/BLL/bin/Debug/BLL.dll
	KnowIsKnow/BLL/bin/Debug/BLL.pdb
	KnowIsKnow/BLL/bin/Debug/DAL.dll
	KnowIsKnow/BLL/bin/Debug/DAL.pdb
	KnowIsKnow/BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
	KnowIsKnow/BLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache
	KnowIsKnow/BLL/obj/Debug/BLL.dll
	KnowIsKnow/BLL/obj/Debug/BLL.pdb
	KnowIsKnow/BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/DAL/bin/Debug/DAL.dll
	KnowIsKnow/DAL/bin/Debug/DAL.pdb
	KnowIsKnow/DAL/obj/Debug/DAL.csproj.FileListAbsolute.txt
	KnowIsKnow/DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache
	KnowIsKnow/DAL/obj/Debug/DAL.dll
	KnowIsKnow/DAL/obj/Debug/DAL.pdb
	KnowIsKnow/DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

	KnowIsKnow/DBUtility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/KnowIsKnow.v12.suo
	KnowIsKnow/KnowIsKnow/bin/BLL.dll
	KnowIsKnow/KnowIsKnow/bin/BLL.pdb
	KnowIsKnow/KnowIsKnow/bin/DAL.dll
	KnowIsKnow/KnowIsKnow/bin/DAL.pdb
	KnowIsKnow/KnowIsKnow/bin/KnowIsKnow.dll
	KnowIsKnow/KnowIsKnow/bin/KnowIsKnow.pdb

	KnowIsKnow/KnowIsKnow/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.csproj.FileListAbsolute.txt

	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.csprojResolveAssemblyReference.cache
	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.dll
	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.pdb

	KnowIsKnow/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/FirstFactor/knowisknow

Conflicts:
	KnowIsKnow/BLL/bin/Debug/BLL.dll
	KnowIsKnow/BLL/bin/Debug/BLL.pdb
	KnowIsKnow/BLL/bin/Debug/DAL.dll
	KnowIsKnow/BLL/bin/Debug/DAL.pdb
	KnowIsKnow/BLL/bin/Debug/DBUtility.dll
	KnowIsKnow/BLL/bin/Debug/DBUtility.pdb
	KnowIsKnow/BLL/bin/Debug/Model.dll
	KnowIsKnow/BLL/bin/Debug/Model.pdb
	KnowIsKnow/BLL/obj/Debug/BLL.csproj.FileListAbsolute.txt
	KnowIsKnow/BLL/obj/Debug/BLL.csprojResolveAssemblyReference.cache
	KnowIsKnow/BLL/obj/Debug/BLL.dll
	KnowIsKnow/BLL/obj/Debug/BLL.pdb
	KnowIsKnow/BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/DAL/bin/Debug/DAL.dll
	KnowIsKnow/DAL/bin/Debug/DAL.pdb
	KnowIsKnow/DAL/bin/Debug/DBUtility.dll
	KnowIsKnow/DAL/bin/Debug/DBUtility.pdb
	KnowIsKnow/DAL/bin/Debug/Model.dll
	KnowIsKnow/DAL/bin/Debug/Model.pdb
	KnowIsKnow/DAL/obj/Debug/DAL.csproj.FileListAbsolute.txt
	KnowIsKnow/DAL/obj/Debug/DAL.csprojResolveAssemblyReference.cache
	KnowIsKnow/DAL/obj/Debug/DAL.dll
	KnowIsKnow/DAL/obj/Debug/DAL.pdb
	KnowIsKnow/DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/DBUtility/bin/Debug/DBUtility.dll
	KnowIsKnow/DBUtility/bin/Debug/DBUtility.pdb
	KnowIsKnow/DBUtility/obj/Debug/DBUtility.csproj.FileListAbsolute.txt
	KnowIsKnow/DBUtility/obj/Debug/DBUtility.dll
	KnowIsKnow/DBUtility/obj/Debug/DBUtility.pdb

	KnowIsKnow/DBUtility/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/KnowIsKnow.v12.suo
	KnowIsKnow/KnowIsKnow/AdminPage.aspx
	KnowIsKnow/KnowIsKnow/AdminPage.aspx.cs
	KnowIsKnow/KnowIsKnow/AdminPage.aspx.designer.cs
	KnowIsKnow/KnowIsKnow/Procenter.aspx
	KnowIsKnow/KnowIsKnow/bin/BLL.dll
	KnowIsKnow/KnowIsKnow/bin/BLL.pdb
	KnowIsKnow/KnowIsKnow/bin/DAL.dll
	KnowIsKnow/KnowIsKnow/bin/DAL.pdb
	KnowIsKnow/KnowIsKnow/bin/DBUtility.dll
	KnowIsKnow/KnowIsKnow/bin/DBUtility.pdb
	KnowIsKnow/KnowIsKnow/bin/KnowIsKnow.dll
	KnowIsKnow/KnowIsKnow/bin/KnowIsKnow.pdb
	KnowIsKnow/KnowIsKnow/bin/Model.dll
	KnowIsKnow/KnowIsKnow/bin/Model.pdb
	KnowIsKnow/KnowIsKnow/css/Mmaster.css
	KnowIsKnow/KnowIsKnow/css/ProCenter.css
	KnowIsKnow/KnowIsKnow/js/Mmaster.js
	KnowIsKnow/KnowIsKnow/js/procenter.js

	KnowIsKnow/KnowIsKnow/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.csproj.FileListAbsolute.txt

	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.csprojResolveAssemblyReference.cache
	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.dll
	KnowIsKnow/KnowIsKnow/obj/Debug/KnowIsKnow.pdb
	KnowIsKnow/Model/bin/Debug/Model.dll
	KnowIsKnow/Model/bin/Debug/Model.pdb

	KnowIsKnow/Model/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KnowIsKnow/Model/obj/Debug/Model.csproj.FileListAbsolute.txt
	KnowIsKnow/Model/obj/Debug/Model.dll
	KnowIsKnow/Model/obj/Debug/Model.pdb