Generated javadoc and uploaded it to folk.uio.no/roarher/projects/javadoc/
Merge remote-tracking branch 'origin/master'