adding category colors in admin page
mergin conflicts
merging conflicts