Fixed cancel button action
Merge branch 'dev-set3-iteration2' of https://github.com/333fred/wpi-suite-tng into dev-set3-iteration2