Train and lorry cranes can now put a container on the lorry/train

Fixed mergeconflicts.