Changed distance calculation in auto2 from camera to rangefinder
Merge origin/master