last fixes
Merge branch 'master' of https://github.com/jackassh96/Handsim-Marketplace.git