Merge branch 'master' of github.com:ging/vish into categories
Merge branch 'categories' of github.com:ging/vish into categories
Categories edit workin