Merge branch 'jem' into jay
dev
Merge remote-tracking branch 'origin/jem' into jem
Merge branch 'jem' into jay
messages and profile
Merge remote-tracking branch 'origin/jay' into jay
fix conflicts on sellers code