Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo
Merge branch 'master' of github.com:SquadCollaborativeRobotics/collectorbot_gazebo