Updated javadocs
Merge branch 'master' of https://github.com/zwaldowski/ProjectTeamRocket.git