Merge origin/master into ratrunexperiments

Conflicts fixed:
	core/src/main/java/com/graphhopper/routing/Path.java
	core/src/main/java/com/graphhopper/util/Instruction.java
	core/src/main/java/com/graphhopper/util/InstructionUtil.java
	core/src/test/java/com/graphhopper/util/InstructionListTest.java