Beacon search work
Merge branch 'beacon_search' into dumb_planner

Conflicts:
	ros_workspace/src/executive/launch/executive.launch
Merge remote-tracking branch 'origin/dumb_planner' into dumb_planner