class file
filter change
class change
json array bug
Merge branch 'dengguangqing-master'

Conflicts:
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/controller/QueryServlet.class
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/dao/QueryDAO.class
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/service/QueryService.class
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/util/WhoisUtil.class
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/web/ErrorFilter.class
	source/whois/WebRoot/WEB-INF/classes/com/cnnic/whois/web/WhoisFilter.class
help & 400 error
update according to CNNIC repository

update according to CNNIC repository