move to rails4
finish moving to rails4
Merge branch 'rails4' into develop
Merge branch 'develop'