对setting页面的修改包括网页，CSS，JS
Merge remote-tracking branch 'origin/master'

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/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