make work with locales
make work i18n
Merge pull request #1 from alejandrobabio/master

See http://stackoverflow.com/questions/26322158/i18n-locale-getting-reset-to-en-in-between-controller-and-the-view?answertab=votes#tab-top