Merge branch 'master' of https://github.com/engaric/graphhopper

Conflicts:
	acceptancetesting/src/main/java/uk/co/ordnancesurvey/routing/GraphHopperHooks.java
	acceptancetesting/src/main/java/uk/co/ordnancesurvey/routing/GraphHopperUIUtil.java
	acceptancetesting/src/test/cucumber/routing.feature
	acceptancetesting/src/test/resources/test.properties
Added back the routing java classes
Merge branch 'master' of https://github.com/engaric/graphhopper