Updated UML, fusion of campus modules and other tweaks

2 jobs for fusion_campus in 1 minute and 37 seconds (queued for 24 minutes and 38 seconds)