-Fixed a bug with "/delete all nobeacon"
-Converted cargo ship spawn manager to use in-game definitions
Merge remote-tracking branch 'upstream/master'
Make chat history thread safe