Merge pull request #1 from expertiza/rails4

Updating from expertiza:rails4
commiting E1476 after merging the latest expertiza rails4 branch
replacing the first 3 lines that were giving error but its not related to E1476