updated source and removed compiled javadocs
fixing conflicts