Fixed CodePro issues, mostly uncessary imports
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5
Fix merge issues
Merged local commits
Fix merge errors
Merge branch 'dev-set3-iteration5' of github.com:333fred/wpi-suite-tng into dev-set3-iteration5