some cleanup
delivery to inactive vessels works
more cleanup
merge with upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Source/KolonyTools.v12.suo
another merge
Merge pull request #164 from Cyrik/master

deliveries to non active vessels