checkstyle arrange.
Merge commit 'ddea6321ceaaa50a4db08af25eab2b422092b521' into dev
Merge pull request #27 from cnnic/dev

Dev
Merge remote-tracking branch 'cnnic/master' into dev
ipUTil add test cases
Merge remote-tracking branch 'remoteGit/dev' into dev
Merge pull request #201 from wade1012/dev

Dev Wade
checkstyle arragement.
Merge remote-tracking branch 'cnnic/dev' into dev
fix unit test problem
Merge pull request #202 from wade1012/dev

Dev Wade
Merge pull request #203 from forumbyr/master

fix unit test problem
Merge pull request #204 from forumbyr/master

fix unit test problem:close connection after test.
checkstyle arrangement
Merge commit '15d742d314face59fa444fc5cdfa1e852499c56a' into dev
Merge pull request #205 from wade1012/dev

Dev Wade
Merge branch 'cnnicdev' into domainQ

Conflicts:
	rdap-webapp/src/main/java/cn/cnnic/rdap/common/RdapProperties.java