ShipStatus: Uncomment ship 2
Add ShipBlockConnection
Add ShipBlockConnection
Fix build
Merge remote-tracking branch 'origin/master'

Conflicts:
	polaris_shared/src/packets/server/ShipBlockPacket.cpp