Class diagrams
Fixed test to use the current server
Merge branch 'develop' into robin