test
Merge branch 'master' of github.com:chiwunau/au-ros-pkg

Conflicts:
	detect_touched_object/manifest.xml