Fixed null pointer exception caused by merge error in the manager layer
Merge branch 'dev-set3-iteration3' of github.com:333fred/wpi-suite-tng into dev-set3-iteration3