Added ContainerShip and Barge
Changed Bar/ContainerShip/Crane

Added javadoc, changed movetolocation in crane
Merge Conflict fix