updating state_machine, fixing Waypoint
Merge branch 'master' of https://github.com/gkanwar/rss-team-6

Conflicts:
	src/rosjava_pkg/settings.gradle