Merge branch 'master' into 0.6

Author: Peter

CONTRIBUTING.md

@@ -24,9 +24,15 @@ appear on your fork its github page afterwards.
 
 ## License Agreement
 
-For contributions like pull requests, bug fixes and translations please read and electronically sign 
-the <a href="http://www.clahub.com/agreements/graphhopper/graphhopper">GraphHopper License Agreement</a>,
-which gives not away your rights but it will make sure for others that you agree to the Apache License, Version 2.
+For contributions like pull requests, bug fixes and translations please read 
+the <a href="https://graphhopper.com/agreements/individual-cla.html">GraphHopper License Agreement</a>, which includes our
+<a href="https://graphhopper.com/agreements/cccoc.html">contributor covenant code of conduct</a>.
+<a href="https://graphhopper.com/#contact">Send us</a> an email with the signed print out of this CLA. Or, if you prefer
+the faster electronically method via signaturit.com, please send us an email with a request for this - 
+keep in mind that this requires storing your Email there. The same applies if you want to sign a CLA for your whole company.
+
+Note, our CLA does not influence your rights on your contribution but it makes sure for others that you agree to the Apache License, Version 2.
+After this you'll appear in the <a href="CONTRIBUTORS.md">contributors list</a> and you pull request can be also technically discussed.
 
 ## Syntax:
 

core/files/changelog.txt

@@ -2,7 +2,7 @@
     removed methods deprecated in 0.4 and 0.5
     renamed EdgeEntry to SPTEntry and AStar.AStarEdge to AStar.AStarEntry
     parameter force removed from AbstractFlagEncoder.applyMaxSpeed
-    GHResponse now wraps multiple AltResponse; renames GraphHopper.getPaths to calcPaths as 'get' sounds too cheap; a new method RoutingAlgorithm.calcPaths is added; see #596
+    GHResponse now wraps multiple PathWrapper; renamed GraphHopper.getPaths to calcPaths as 'get' sounded too cheap; a new method RoutingAlgorithm.calcPaths is added; see #596
     moving lgpl licensed file into own submodule graphhopper-tools-lgpl
     renaming of Tarjans algorithm class to TarjansSCCAlgorithm
     more strict naming for Weighting enforced and more strict matching to select Weighting (equals check), #490