made things compile to get javadoc working
merge commit
there might have been a few conflicts