Change class diagrams
merge from remote