deploy
Merge branch 'rails4-develop' into rails4