local merge
Merge branch 'master' of https://github.com/takustaqu/mocal-UI
恥部の消去