Fixed javadoc error on line 75.
Merge branch 'master' of https://github.com/gem-5/last-adventures into jack/dev

merging master into jack/dev