Merge branch 'master' of github.com:SquadCollaborativeRobotics/global_planner into shawn
Merge branch 'shawn' into april_tags
Fixed dependencies