Touchups
Merge remote-tracking branch 'origin/master' into networking

Conflicts:
	src/core/MarketSimulation.java
	src/core/actors/Actor.java
	src/core/channels/OfferChannel.java