tadaaaammmm
Merge branch 'master' of https://github.com/Bluemriine/BatailleNavale

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/bluemriine/bataillenavale/Plateau.java
	app/src/main/res/values/strings.xml