javadoc
Merge branch 'master' of https://github.com/HappyDestroy/Marnhy
Javadoc OK