changes
Merge branch 'listcategories' of github.com:ging/vish into listcategories