Merge pull request #2 from cnnic/master

download
modify the display format of IP addresses

include both v4 and v6 addreses
Merge pull request #3 from cnnic/master

download
Bug removal and modification on error response

modified the format of error response message and removed one bug
relating to query to table dnrentity
Merge branch 'master' of https://github.com/dengguangqing/restfulwhois into 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/src/com/cnnic/whois/controller/QueryServlet.java
	source/whois/src/com/cnnic/whois/util/WhoisUtil.java