final javadocs, please regenerate if you edit something
Merge branch 'master' of https://github.com/Jrende/IV1201