Merge branch 'feature_unique_nomenclature' of www-intra.cns.s.u-tokyo.ac.jp:root/cns-hp into feature_unique_nomenclature
