Merge branch 'dev' into views
rename fixes
Categories index style&code fixes
not_login user fix
Merge branch 'i18n' into dev
merge views into dev
Merge branch 'dev' into i18n