Merge branch 'develop' of github.com:hron84/rails-i18n into develop