Finished ScoreRow javadocs
Merge origin/master