added $type param to hook_department_settings, hook_programme_settings
Merge branch 'master' of https://github.com/charyorde/acm