refs 6949 SubCarrierTypeの追加、Catalogの追加
Merge branch 'master' of github.com:MiraitSystems/enju_trunk