Merge pull request #74 from forumbyr/master

sperate format ; add view resolver
Merge pull request #75 from forumbyr/master

add xml text and view resolver
Merge pull request #76 from forumbyr/master

remove format when init cache
Merge pull request #77 from forumbyr/master

add some cache query
Merge pull request #78 from forumbyr/master

add search query
Merge pull request #79 from forumbyr/master

move fuzzy query to search dao
Merge pull request #80 from forumbyr/master

add permission controll
Merge pull request #82 from forumbyr/master

fix bug-query entity
Merge pull request #83 from forumbyr/master

update permission control
Merge pull request #84 from forumbyr/master

init cache bug
Merge pull request #85 from forumbyr/master

init entity cache
Merge pull request #86 from forumbyr/master

fuzzy query :permission control
Merge pull request #87 from forumbyr/master

ns ip and entity vcard format
Merge pull request #1 from cnnic/master

fetch from cnnic
Merge pull request #88 from forumbyr/master

add redirection query
Merge pull request #89 from forumbyr/master

add properties file
Merge pull request #2 from cnnic/master

fetch from cnnic
add test file
Merge pull request #90 from yun51/master

add test file
Merge pull request #6 from cnnic/master

merge from cnnic