Add tag-box_area app/views/plan/index.html.erb
Merge remote-tracking branch 'origin/master' into tab-box
Merge branch 'tab-box'
Merge remote-tracking branch 'origin/master'