Seperate ship query endpoints from enabled ships...
Merge remote-tracking branch 'origin/master'