fix bug
Merge pull request #105 from forumbyr/master

fix bug
Merge pull request #5 from cnnic/master

fetch from cnnic
Merge branch 'Mmaster' into YUN

Conflicts:
	source/whois/src/com/cnnic/whois/view/JsonResponseWriter.java
	source/whois/src/com/cnnic/whois/view/TextResponseWriter.java
	source/whois/src/com/cnnic/whois/view/XmlResponseWriter.java
init cache use spring
Merge pull request #107 from forumbyr/master

init cache use spring
json to xml
Merge pull request #6 from cnnic/master

fetch from cnnic
Merge branch 'Mmaster' into YUN
query controller add ns
Merge pull request #108 from forumbyr/master

query controller add ns
Merge pull request #7 from cnnic/master

fetch from cnnic
Merge branch 'Mmaster' into YUN
add parse entity param
entity search solr url
Merge pull request #8 from forumbyr/master

fetch from forumbyr
Merge branch 'Mmaster' into YUN