Some changes in API + Security
Merge branch 'master' of https://github.com/morgan-linux/hacked-ships