FS
Merge branch 'master' of github.com:Scoms/Iaato

Conflicts:
	src/Iaato/IaatoBundle/Entity/Ship.php~