vcardarray
Merge branch 'dengguangqing-master'

Conflicts:
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/util/WhoisUtil.class
	source/whois/src/com/cnnic/whois/util/WhoisUtil.java