Mirrors changes from master into javadoc
Fixed weird javadoc
Merge branch 'javadoc'
Fixed javadoc links