Rails 4.0.2 migration
Merge branch 'master' of github.com:cirope/mawidabp