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