minor changes
fix merge conflicts
added back end for products, servcies, policies and categories