稲垣君のをマージ前
Merge branch 'develop' into crtSmn
dump updated & dispfunc completed
Merge branch 'crtSmn' into develop