Revert "consertado"

This reverts commit f58a85a345fec24a874a26c43a37220bdcbbeea8.
rails 4.0 working
Merge branch 'rails4.0'