make db changes
add/refactor delivery model to cater for both ug and pg
update import sites statement to use new ug format
oops!
re-arrange things
show deliveries for UG too
removed unused function
Add delivery info to ug api output
add some tests for deliveries
remove cache test, not necessary.
refactor module import
todo after deploy: change cron to run module import after sitsimport task
fix for specific delivery class dependance
remove moduledata task from programme save
Merge pull request #784 from unikent/refactor/ug_deliveries

Refactor UG deliveries