all to the trash
100% more rails 4
Merge branch 'feature/uptorails4' into develop