added bordered_box to scaffolded views
Merge branch 'master' into rails4