Fixed typo in javadoc
Merge branch 'feature/see-changed-nicks' into develop