Template finish
Template finished
Merge branch 'rails4-develop' into rails4