first commit
Merge branch '6.1' of https://github.com/liangxin95/test

Conflicts:
	VCAC/VCAC/config.ini
	VCAC/VCAC/script/VCAC_SSO.cs