Adding javadoc to some classes
Fixing conflicts