Correctly Check Overlapping Iterations
Merge branch 'dev-iteration5' of https://github.com/gsisko/wpi-suite-tng into dev-iteration5