relax API
Merge branch 'master' into relaxAPI
Merge branch 'master' into relaxAPI
relax api
relax API
Merge branch 'master' into relaxAPI
relax api
relax API
Merge branch 'master' into relaxAPI

Conflicts:
	jsprit-core/src/main/java/algorithms/CreateInitialSolution.java
	jsprit-core/src/main/java/algorithms/RuinAndRecreateModule.java
	jsprit-core/src/main/java/algorithms/StateManager.java
	jsprit-core/src/main/java/algorithms/StateTypes.java
	jsprit-core/src/main/java/algorithms/StateUpdates.java
	jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
	jsprit-core/src/test/java/algorithms/BuildCVRPAlgoFromScratchTest.java
	jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java
Merge branch 'master' into relaxAPI

Conflicts:
	jsprit-core/src/main/java/algorithms/StateUpdates.java
	jsprit-core/src/main/java/algorithms/VehicleRoutingAlgorithms.java
	jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java
relax api
relax api
modeling shipment
Merge branch 'master' into relaxAPI

Conflicts:
	jsprit-core/src/main/java/algorithms/CalcUtils.java
	jsprit-core/src/main/java/algorithms/CalculatesServiceInsertion.java
	jsprit-core/src/main/java/algorithms/CalculatesServiceInsertionOnRouteLevel.java
	jsprit-core/src/main/java/algorithms/CalculatorBuilder.java
	jsprit-core/src/main/java/algorithms/InsertionFactory.java
	jsprit-core/src/main/java/algorithms/MarginalsCalculusTriangleInequality.java
	jsprit-core/src/main/java/algorithms/RuinAndRecreateModule.java
	jsprit-core/src/main/java/algorithms/RuinListeners.java
	jsprit-core/src/main/java/algorithms/StateTypes.java
	jsprit-core/src/main/java/algorithms/StateUpdates.java
	jsprit-core/src/test/java/algorithms/BuildCVRPAlgoFromScratchTest.java
	jsprit-core/src/test/java/algorithms/BuildPDVRPAlgoFromScratchTest.java
	jsprit-core/src/test/java/algorithms/GendreauPostOptTest.java
	jsprit-core/src/test/java/algorithms/TestCalculatesServiceInsertion.java
modeling the problem
modeling pickups and deliveries
define distances between shipments and services
relax api
shipment insertion calculation
Merge branch 'master' into PickupAndDelivery