adding javadoc
fixed merge + adding UML to repport