fixed ship type enum
Merge origin/master