Adding categories to products
merged
fixed merge problems