siguiendo con la i18n parte2
Merge branch 'dev' of https://github.com/frankjdelgado/rubyproject1 into dev