Merge pull request #482 from yqz1016/dev

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