Subrequirement80%done
Merge branch 'dev-iteration5' of github.com:gsisko/wpi-suite-tng into dev-iteration5