finished javadoc, fixed some wrong spelling
Merge remote-tracking branch 'origin/master'