Category Suggestions
fix merge
Merge branch 'xremix-category-suggestion'