app/controllers/application_controller.rb

fix the i18n nil locale
Merge branch 'master' of github.com:RorLaurentium/The1stMode