Added JDOC
Fixed merge errors in Server Javadocs