Categories.
Inline creation of new items.
Merge branch 'master' into gh-pages