Added the Category features and merging category_views branch