Added javadoc
Finished javadoc
Merge branch 'javadoc'