Updating prototype controller stuff
Merge branch 'dev-iteration3' of https://github.com/gsisko/wpi-suite-tng into dev-iteration3