Large GUI Update
Merge branch 'master' of https://github.com/Gabino3/socAI

Conflicts:
	Assets/Scripts/TradeManager.cs