Merge branch 'dev' into i18n
paginator style fix
active_admin localization on create/update category fixes
Merge branch 'i18n' into views
localization views
localize user_modal.html
Merge branch 'views' into i18n
devise edit profile localize
devise localization fix
Merge branch 'i18n' into dev