Updated for project 3: obstacle avoidance.
Merge branch '4555-project-3' into 4555-sp13
Some fixes to make the standalone work properly.