Merge branch 'i18n' into views
localization views
localize user_modal.html
Merge branch 'views' into i18n