Merge branch 'master' of https://github.com/yksoft/ykPermission
Merge branch 'master' of https://github.com/yksoft/ykPermission

Conflicts:
	ykPermission/ykPermission.Service/Master/MasterService.cs
	ykPermission/ykPermission.Service/bin/Debug/ykPermission.Model.dll
	ykPermission/ykPermission.Service/bin/Debug/ykPermission.Model.pdb
	ykPermission/ykPermission/Manage/AdminPage.cs
	ykPermission/ykPermission/Manage/Login.aspx.cs
	ykPermission/ykPermission/bin/ykPermission.Common.dll
	ykPermission/ykPermission/bin/ykPermission.Common.pdb
	ykPermission/ykPermission/bin/ykPermission.Dao.dll
	ykPermission/ykPermission/bin/ykPermission.Dao.pdb
	ykPermission/ykPermission/bin/ykPermission.Model.dll
	ykPermission/ykPermission/bin/ykPermission.Model.pdb
	ykPermission/ykPermission/bin/ykPermission.Service.dll
	ykPermission/ykPermission/bin/ykPermission.Service.pdb
	ykPermission/ykPermission/obj/Debug/ResolveAssemblyReference.cache
	ykPermission/ykPermission/ykPermission.Web.csproj