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

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