ships have subclasses
Merge branch 'master' into dev2
ship has subclasses
Merge branch 'dev2'