Finish rollback rails4 - rails3
Merge branch 'rollback'

* rollback:
  Finish rollback rails4 - rails3