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

Conflicts:
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/NoticeDao.java
	rdap-webapp/src/main/java/org/restfulwhois/rdap/dao/impl/NoticeDaoImpl.java
ignore cidr in response json
rollback noticeDao
Merge pull request #468 from yqz1016/dev

fix bug 182