Added javadoc
Merge branch 'master' of https://github.com/heyang123/CZ3003CMS