Merge branch 'clean_university_model' into 'master'

Updated University model and related

See merge request chehabfl/outgoing_rex!28
3 jobs for master in 10 seconds (queued for 1 second)