イベント新規登録あたりを修正
Merge branch 'master' of /Users/afuru/RubymineProjects/Solbrain with conflicts.
Merge remote-tracking branch 'origin/master'