Javadoc Updates
-- Sorry about the mass merge conflicts
Merge branch 'dev-iteration4' of https://github.com/gsisko/wpi-suite-tng into dev-iteration4