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
Merge pull request #173 from warmdawn/dev

Dev
Merge remote-tracking branch 'cnnic/dev' into dev