Merge branch 'add-university-services' into 'master'

Added university services + cl-mail

See merge request !13