Lock ships unless they are unlocked in db
Merge pull request #436 from dreamteam69/master

Lock ships unless they are unlocked in db
Merge remote-tracking branch 'upstream/master'