Updatering
- JavaDoc

onödiga
Merge remote-tracking branch 'upstream/master'