WIP of fixing huge orgs dropdown
Merge branch 'master' into orgs
there's no reason to send University as a model to the client.