Added javadocs to classes and methods.
Fixed javadoc error on line 75.
Merge remote-tracking branch 'origin/master' into james/dev
Merge remote-tracking branch 'origin/master' into james/dev