Slingshot Subin/Cory

The slingshot robot cory/subin
Merge origin/team-devel into team-devel