Changed some state execution code
modified some state transitions for waypoint navigation
Merge branch 'master' of github.com:SquadCollaborativeRobotics/global_planner

Conflicts:
	src/RobotController.cpp
Merge branch 'master' of github.com:SquadCollaborativeRobotics/global_planner
Merge branch 'master' of github.com:SquadCollaborativeRobotics/global_planner into sam