Cleaned up imports noticed by CodePro.
Merge branch 'dev' of github.com:alexhenning/wpi-suite-tng into dev