merchant can edit products

@cgruppioni @aslawter 

This branch was repurposed after it was created to focusing on editing as a whole. The branch name was changed locally, but I haven't been able to do anything about the name here.
Doesn't this instance var need to match the one on 33, and vice versa?