Merge origin/master

Conflicts:
	src/model/ship/shipscifi/Crusader.java
	src/model/ship/shipscifi/Hunter.java
	src/model/ship/shipscifi/MotherShip.java
	src/model/ship/shipscifi/Viper.java
	src/model/ship/shipxviii/Barque.java
	src/model/ship/shipxviii/Galere.java
	src/model/ship/shipxviii/Gallion.java
	src/model/ship/shipxviii/Transport.java
	src/model/ship/shipxx/Croiseur.java
	src/model/ship/shipxx/Fregate.java
	src/model/ship/shipxx/Jetski.java
	src/model/ship/shipxx/PorteAvion.java
	src/model/ship/shipxx/Sousmarin.java
Merge origin/master

Conflicts:
	src/model/ship/shipscifi/Crusader.java
	src/model/ship/shipscifi/Hunter.java
	src/model/ship/shipscifi/MotherShip.java
	src/model/ship/shipscifi/Viper.java
	src/model/ship/shipxviii/Barque.java
	src/model/ship/shipxviii/Galere.java
	src/model/ship/shipxviii/Gallion.java
	src/model/ship/shipxviii/Transport.java
	src/model/ship/shipxx/Croiseur.java
	src/model/ship/shipxx/Fregate.java
	src/model/ship/shipxx/Jetski.java
	src/model/ship/shipxx/PorteAvion.java
	src/model/ship/shipxx/Sousmarin.java
Merge origin/master
Merge origin/master

Conflicts:
	src/model/ship/shipscifi/Crusader.java
	src/model/ship/shipscifi/Hunter.java
	src/model/ship/shipscifi/MotherShip.java
	src/model/ship/shipscifi/Viper.java
	src/model/ship/shipxviii/Barque.java
	src/model/ship/shipxviii/Galere.java
	src/model/ship/shipxviii/Gallion.java
	src/model/ship/shipxviii/Transport.java
	src/model/ship/shipxx/Croiseur.java
	src/model/ship/shipxx/Fregate.java
	src/model/ship/shipxx/Jetski.java
	src/model/ship/shipxx/PorteAvion.java
	src/model/ship/shipxx/Sousmarin.java