Update of the javadoc
Merge branch 'master' of https://github.com/Zyoruk/3rdProject