Added more javadocs and cleaned up code for these classes a little.
Merge branch 'master' of github.com:n-martin/DPM-team4