refs 6788 画面幅の修正
Merge remote-tracking branch 'origin/master' into redesign