Merge pull request #155 from wade1012/dev

Dev Wade
Merge pull request #156 from forumbyr/master

modify database tables.
Merge pull request #157 from forumbyr/master

entity query - add address and telephone
Merge pull request #23 from cnnic/dev

Dev
add ip test
add ip ipQueryParam ipDaoImpl
modify QueryService and Impl and InvalidUriFilter
modify RdapController QueryParser 
fix some nameserver flag and ipAddress
Merge pull request #159 from forumbyr/master

domain query validate:trim space;
Merge branch 'bak' into dev

Conflicts:
	rdap-webapp/src/main/java/cn/cnnic/rdap/controller/RdapController.java
	rdap-webapp/src/main/java/cn/cnnic/rdap/service/QueryService.java
	rdap-webapp/src/main/java/cn/cnnic/rdap/service/impl/QueryServiceImpl.java
Merge remote-tracking branch 'remoteGit/dev' into dev
Merge remote-tracking branch 'cnnic/dev' into dev
change long function to short
delete notice Fuction
Merge pull request #161 from wade1012/dev

Dev Wade
arpa domain query.
arpa domain query:add networkquerydaoimpl.
Merge pull request #162 from warmdawn/dev

arpa domain query
entity query:inner entities.
merge from cnnic.