Merge branch 'buyer' into master.
Merged branch 'buyer' into master.
ref None, fixed after save product link to wrong page.
updated left panel to show username / image
Merged branch 'master' into buyer.
refs None, fixed XSS issue.