Cleaning up code in models and adding JavaDoc.
Merge branch 'master' of https://github.com/CMPUT301F13T08/CMPUT301F13T08.git
Fixed some code in the tests for retrieving an id from the Story model.