Resolved Conflict
Committing changes prior to pull
Resolved merge conflict. Solved two bugs, first AIs closing shop screen when they entered a shop, second two inventories causing bugs in refresh of inventories.