incorporate postgraduate courses into the xcri-cap-feed
Merge branch 'develop' of https://github.com/unikent/programmes-plant into feature/add-pg-to-xcri-cap
Merge branch 'develop' of https://github.com/unikent/programmes-plant into feature/add-pg-to-xcri-cap

Conflicts:
	application/models/api.php
fixed that fact that related courses don't show awards properly
Rework modules task
Merge branch 'develop' of github.com:unikent/programmes-plant into feature/modules-pg
Allow pass of ug/pg param to API functions + fix programme misidentifiying model (use hard-coded value)
Correct cachekeys and extract method
Merge pull request #523 from unikent/feature/fix-awards

fixed that fact that related courses don't show awards properly
Merge branch 'develop' of github.com:unikent/programmes-plant into feature/modules-pg
Only get data for PG taught programmes
Fix UG modules + first pass fixing module tests
More test fixes
Re add UG to module loader
Merge pull request #524 from unikent/feature/modules-pg

Add support for PG modules
fixed broken ucas_code for UG

also added programme-type field for PG
Merge pull request #530 from unikent/bugs/broken-ucas

fixed broken ucas_code for UG
Merge branch 'develop' of https://github.com/unikent/programmes-plant into feature/add-pg-to-xcri-cap
Fix diffing unpublished + refactor code a little
Add working replace_ids_with_values for "staff" type