Added update view for product
Fixing merge problems
Fixed views and urls
Added update view