Work in progress
Merge remote-tracking branch 'origin/hack' into hack

Conflicts:
	src/main/java/org/nhl/containing/cranes/Crane.java
	src/main/java/org/nhl/containing/cranes/StorageCrane.java