added methods edit and update for categories and products
fixed conflict in categories view
Merge branch 'new_product'