首页、登录、注册等页面基本调整
Merge branch 'master' of github.com:sunallen521/KaoAkao

Conflicts:
	.gitignore
	KaoAKao.Business/bin/Debug/KaoAKao.Business.dll
	KaoAKao.Business/bin/Debug/KaoAKao.Business.pdb
	KaoAKao.Business/bin/Debug/KaoAKao.DAL.dll
	KaoAKao.Business/bin/Debug/KaoAKao.DAL.pdb
	KaoAKao.Business/bin/Debug/KaoAKao.Entity.dll
	KaoAKao.Business/bin/Debug/KaoAKao.Entity.pdb
	KaoAKao.Business/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KaoAKao.Business/obj/Debug/KaoAKao.Business.csprojResolveAssemblyReference.cache
	KaoAKao.Business/obj/Debug/KaoAKao.Business.dll
	KaoAKao.Business/obj/Debug/KaoAKao.Business.pdb
	KaoAKao.DAL/bin/Debug/KaoAKao.DAL.dll
	KaoAKao.DAL/bin/Debug/KaoAKao.DAL.pdb
	KaoAKao.DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KaoAKao.DAL/obj/Debug/KaoAKao.DAL.dll
	KaoAKao.DAL/obj/Debug/KaoAKao.DAL.pdb
	KaoAKao.Entity/bin/Debug/KaoAKao.Entity.dll
	KaoAKao.Entity/bin/Debug/KaoAKao.Entity.pdb
	KaoAKao.Entity/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KaoAKao.Entity/obj/Debug/KaoAKao.Entity.dll
	KaoAKao.Entity/obj/Debug/KaoAKao.Entity.pdb
	KaoAKao2.0.Web/KaoAKao.Web.csproj
	KaoAKao2.0.Web/bin/KaoAKao.Business.dll
	KaoAKao2.0.Web/bin/KaoAKao.Business.pdb
	KaoAKao2.0.Web/bin/KaoAKao.DAL.dll
	KaoAKao2.0.Web/bin/KaoAKao.DAL.pdb
	KaoAKao2.0.Web/bin/KaoAKao.Entity.dll
	KaoAKao2.0.Web/bin/KaoAKao.Entity.pdb
	KaoAKao2.0.Web/bin/KaoAKao2.0.Web.dll
	KaoAKao2.0.Web/bin/KaoAKao2.0.Web.pdb
	KaoAKao2.0.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KaoAKao2.0.Web/obj/Debug/KaoAKao.Web.csprojResolveAssemblyReference.cache
	KaoAKao2.0.Web/obj/Debug/KaoAKao2.0.Web.dll
	KaoAKao2.0.Web/obj/Debug/KaoAKao2.0.Web.pdb
	KaoAKao2.0.v11.suo