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
Merge branch 'develop' of https://github.com/unikent/programmes-plant into feature/add-pg-to-xcri-cap
incorporate the level as a parameter so thats its not always automatically worked out using the routing system. the xcri feed generation does not rely on routing
split the xcri-cap views into two, one for ug and another for pg
dots seem to work better than slashes for cache keys
Merge branch 'develop' of https://github.com/unikent/programmes-plant into feature/add-pg-to-xcri-cap
check that there are related courses to merge before attempting a sort
ensure all required field are in pg courses cap output
Merge branch 'develop' of https://github.com/unikent/programmes-plant into feature/add-pg-to-xcri-cap
use the award as an identifier for each qualification
identifiers are not necessary for studyMode, attendanceMode and attendancePattern
compute the right study modes
compute the right attendance modes
compute the right attendance modes
fix tests to unbreak xcri feed tests
Merge pull request #506 from unikent/feature/add-pg-to-xcri-cap

Add pg to xcri cap