converting distance calcs to haversine for use with lat-lon
added functions that getCostOSR will use, Stable state (compiles & runs)
Merge branch 'vdev' into develop
Merge branch 'develop' into sdev
Merge branch 'sdev' into develop