Merge pull request #205 from wade1012/dev

Dev Wade
domain redirect query.
Merge branch 'cnnicdev' into domainQ

Conflicts:
	rdap-webapp/src/main/java/cn/cnnic/rdap/common/RdapProperties.java
Merge pull request #207 from forumbyr/master

domain redirect
nameserver,autnum,network redirect.
Merge pull request #208 from forumbyr/master

nameserver,autnum,network redirect.
Merge pull request #209 from cnnic/master

nameserver,autnum,network redirect.
redirect - add unit test.
redirect add unit test for controller.
Merge pull request #210 from forumbyr/master

redirect - add unit test.
validateSearchStringIsValidIdna
handle 500 error.
Merge pull request #211 from forumbyr/master

handle 500 error.
Merge remote-tracking branch 'cnnic/dev' into meok
Merge pull request #212 from warmdawn/dev

add DomainUtil.validateSearchStringIsValidIdna
Merge pull request #14 from cnnic/dev

merge from cnnic
change varients to variants in domain; refactor exceptionResolver
Merge pull request #213 from forumbyr/master

change varients to variants in domain; refactor exceptionResolver
Merge pull request #29 from cnnic/dev

Dev