Merge branch 'master' of https://github.com/usunyu/CleanPath

Conflicts:
	OpenStreetMap/src/process/OSMRouting.java
resolve conflict