add test
add test data
fix text format bug
Merge pull request #164 from larrychen8276/master

modify nameServers search
Merge pull request #18 from cnnic/master

merge from cnnic
refactor openid
Merge pull request #165 from larrychen8276/master

move consumer.properties to classpath
Merge pull request #19 from cnnic/master

merge from cnnic
add proxy test;add logout .
Merge remote-tracking branch 'origin/master' into me
ns query by ip
Merge pull request #166 from forumbyr/master

add test,fix bug
rdap conformance
Merge pull request #167 from forumbyr/master

rdap conformance
rdap conformance
update test
update test
Merge remote-tracking branch 'origin/me' into me
Merge branch 'me' into made

Conflicts:
	source/whois/src/com/cnnic/whois/dao/query/db/AbstractDbQueryDao.java
Merge pull request #168 from forumbyr/master

rdap conformance