edit jdbc-test.properties comments
Merge remote-tracking branch 'rdap_master/dev' into dev
add domain search by nsLdhName or nsIp
Merge remote-tracking branch 'rdap_dev/dev' into dev

Conflicts:
	rdap-webapp/src/test/java/org/restfulwhois/rdap/controller/RdapControllerDomainSearchTest.java
Merge remote-tracking branch 'rdap_dev/dev' into dev

Conflicts:
	rdap-webapp/src/main/java/org/restfulwhois/rdap/controller/RdapController.java
delete print sql
Merge remote-tracking branch 'rdap_dev/dev' into dev
edit comments for method of searchNameserver
create DomainSearchParam add three properties "name","nsLdhName","nsIp"
create DomainSearchParam (add three properties
"name","nsLdhName","nsIp")
create DomainSearchParam add three properties "name","nsLdhName","nsIp"
urlDecode is replaced by urlDecodeAndReplaceAsciiToLowercase
change ipTmp property into ipLowTmp
Merge pull request #428 from xuyao/dev

add domain search by nsLdhName or nsIp
Merge remote-tracking branch 'rdapmaster/dev' into dev