fix FO SEO
Update Retailer Edit form: upload Logo
Merge remote-tracking branch 'upstream/master'