Merge branch 'release/v1.0'
gitの補完用の設定内容を修正
Merge branch 'hotfix/v1.0.1' into develop