Started cleanup of models and addition of Javadoc comments to models
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08