success
fixed conflicts for merging
Merge branch 'putting_pic_field_in_product_form'