Rebases changes bf54a5f to f304b46 onto older version of dev

Introduces changes by Hoang that add comments to controllers.
See https://github.com/Team-Combat-Wombat/wpi-suite-tcw/pull/89 for
more information.