i18n finish
Merge branch 'master' of https://github.com/fscorro/Battleship