make db changes
update backend programme edit urls to use instance_id rather than programme id
add csv output option to api
Merge pull request #786 from unikent/feature/csv_api_output

add csv output option to api
Merge branch 'develop' into feature/programmes_admin_edit_urls
add/refactor delivery model to cater for both ug and pg
update import sites statement to use new ug format
oops!
re-arrange things
Fix error behavior & test for bad fee paths
We should be returning array(), not erroring when that happens - this should now be corrected
show deliveries for UG too
removed unused function
Add delivery info to ug api output
Merge pull request #787 from unikent/fix/bugfix-for-no-fee-behavior

Fix no fee file error behavior
Merge branch 'develop' into feature/programmes_admin_edit_urls
Merge pull request #785 from unikent/feature/programmes_admin_edit_urls

edit urls to use instance_id rather than programme id
add some tests for deliveries
Attempt to more reliably extract true delivery name from delivery descriptions (fixes; FP591628)
Merge branch 'develop' of github.com:unikent/programmes-plant into feature/correct-fees-delivery-name-extraction
Merge pull request #788 from unikent/feature/correct-fees-delivery-name-extraction

correct fees delivery name extraction