convert trade to production and other things
added buying units and a few refactorings
missize merge
merged