make product info form display and editable
Merge remote-tracking branch 'origin/master'