bysato
Merge branch 'dev-koshihikari' into test_bySato
佐藤作業分　経過
Merge branch 'dev-sato'