more good view
Merge branch 'develop' into rails4