refactored ships
Merge branch 'ships' into development
Merge branch 'development'