。
Merge branch 'master' of github.com:SeriaWei/VIPManagement

Conflicts:
	VIPManagement.v12.suo