Merge remote-tracking branch 'cnnic/dev' into meok
Merge pull request #172 from forumbyr/master

fix merge bug; entity search.
regex for x.x.x.ip6.arpa
Merge remote-tracking branch 'cnnic/dev' into meok
add check ipv6 by IPV6Address
Merge commit 'beb03f22727884b7026b8520c322a58d81a0ee11' into dev
Merge pull request #173 from warmdawn/dev

Dev
Merge remote-tracking branch 'cnnic/dev' into dev
fix  ipV6 high NULL bug
fix nameservers null bug
Merge pull request #175 from wade1012/dev

Dev Wade
1.network.addStatus:only add non-dupicate status;
2.entity search:add trim & validate,add inner entities;
3.network queryAsInnerObjects:remove inner entities;
4.jcard util test:add telephone test;
5.entity test: add teardown;
6.add entities test;
Merge remote-tracking branch 'cnnic/dev'

Conflicts:
	rdap-webapp/src/main/java/cn/cnnic/rdap/dao/impl/NetworkQueryDaoImpl.java
fix bug: network.queryAsInner - status handle .