simulator is driving not ai, ai only giving route
Merge branch 'origin/test'

Conflicts:
	src/app/nodes/shapes/Shape.java