Auto generate link property for object
Test for AutoGenerateSelfLink
edit warnings
Merge pull request #456 from forumbyr/master

ip query: check length for v4, for the exception of storing v6 data in v4 entry
Merge pull request #457 from forumbyr/master

fix model type bug.
Merge pull request #458 from forumbyr/master

add ip v6 length check.
create new class ModelUri
add column CIDR
merge.
Merge remote-tracking branch 'rdapmaster/dev' into dev

Conflicts:
	rdap-webapp/checkstyle/checkstyle.xml
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/Autnum.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/BaseModel.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/Domain.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/Entity.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/ModelType.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/Nameserver.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/bean/Network.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/AutnumQueryDaoImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/DomainQueryDaoImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/EntityQueryDaoImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/NameserverQueryDaoImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/NetworkQueryDaoImpl.java
	rdap-webapp/src/main/resources/init/spring-serviceContext-init-loadData.xml
	rdap-webapp/src/main/resources/logback.xml
	rdap-webapp/src/main/resources/spring/spring-serviceContext.xml
	rdap-webapp/src/test/java/org/restfulwhois/rdap/dao/impl/DomainQueryDaoTest.java
	rdap-webapp/src/test/java/org/restfulwhois/rdap/dao/impl/NetworkQueryDaoTest.java
	rdap-webapp/src/test/resources/logback.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/domain-search-acl.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/domain-search.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/domain.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/dsData.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/entity-search-acl.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/entity-search.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/entity.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/ip-query.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/keyData.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/nameserver-search-acl.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/nameserver-search.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/nameserverTest.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/network-redirect.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/networkV4.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/networkV6.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/secureDns.xml
	rdap-webapp/src/test/resources/org/restfulwhois/rdap/dao/impl/teardown.xml
	rdap-webapp/src/test/resources/spring/spring-applicationContext-test.xml
modify class name
Merge pull request #452 from yqz1016/dev

Auto generate link property for object
Merge pull request #18 from cnnic/dev

merge from cnnic