src/devilry/devilry/apps/core

* Added datamigration for delivery_status field
* Added convert method from status to delivery_status
Merge branch 'new-examiner' of github.com:devilry/devilry-django into new-examiner
* Fixed duplicate migration script. Removed and rerun datamigration