fixed merge conflict
Merge remote-tracking branch 'graphhopper/pr/55' into vsimrti

Conflicts:
	core/src/main/java/com/graphhopper/reader/OSMReader.java