Merge branch 'master' of /home/s13006/work/FlickFighter with conflicts.
Merge remote-tracking branch 'origin/master'
ステータス画面レイアウト途中