Added products and categories to database
Merge fixes