Merge origin/gui
updated minimap
Merge origin/gui4
MarketPlace fully tested. Buying price changed to be 85% of selling price
Merge origin/master