Merge branches 'version4' and 'temp' into version4
removed place_list waypoint selection from return_to_base