Completing the changes/additions from Fridays meeting
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/taxe/game/Cargo.java
	core/src/com/taxe/game/GameCore.java