Department changes and Executive education changes
Merge branch 'vic-branch'
Merge branch 'master' of https://github.com/ualberta/institutional-framework