Change listing to accept multiple categories
Merge branch 'develop' into feature/listing_multiple_categories
Merge branch 'feature/listing_multiple_categories' into develop
Fix conflict