Customize Notice and Remark Types
Merge remote-tracking branch 'rdapmaster/dev' into dev

Conflicts:
	rdap-webapp/src/main/java/org/restfulwhois/rdap/core/service/impl/SearchServiceImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/EntityQueryDaoImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/NoticeDaoImpl.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/RemarkQueryDaoImpl.java
Merge pull request #474 from forumbyr/master

fix bug
modify properties
Merge pull request #477 from yqz1016/modifyBug

modify properties
Merge remote-tracking branch 'rdapmaster/dev' into dev
Merge pull request #481 from forumbyr/master

refactor: devide controller.
Merge remote-tracking branch 'rdapmaster/dev' into dev

Conflicts:
	rdap-webapp/src/main/java/org/restfulwhois/rdap/core/controller/CommonController.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/core/controller/DnrController.java
delete RemarkDao and implement
Merge pull request #482 from yqz1016/dev

merge and modify  Customize Notice and Remark Types
modify query sql
Merge remote-tracking branch 'rdapmaster/dev' into dev
add scheme-update-notice
Merge pull request #483 from yqz1016/dev

modify query sql
Merge pull request #22 from cnnic/dev

merge from cnnic