Merge[Adam]: Upgrades in market

Added the upgrade images to the market. Still not connected yet
Merge remote-tracking branch 'origin/adam_branch'