Comments added to the class diagram.
Merge conflict solved.