Fixed fleet not showing.
Merge remote-tracking branch 'origin/dev' into test
Merge branch 'test' of https://github.com/Decidebloom/Intranet into test