Merge pull request #1 from CortexStation/dev

Dev
Basic NCS Victoria additions, and adding asteroid everywhere on the station z level
Merge pull request #2 from CortexStation/master

Merge master into Dev