Docs for ship service
Merge branch 'master' into gh-pages
Updating gh-pages automated API docs