one minor error left
Merge branch 'dev-iteration4' of github.com:gsisko/wpi-suite-tng into dev-iteration4