fix set marketplace in session
fix and improve backoffice
fix back URL
Merge remote-tracking branch 'upstream/master'