category_done

Category model and basic functionality
Merge branch 'category'