Segment, Ship, ShipType
Merge branch 'Ship2.0' of https://github.com/coopmobil/ships into Ship2.0

Conflicts:
	res/layout/activity_battlefield.xml
ImageAdapter