Added support for renaming category.
Prototype, migration & categories stuff.
Fixed merge