Actually delete files from the database via the media REST API
Fix bad merge
Merge branch 'cc-5709-airtime-analyzer' into saas

Conflicts:
	airtime_mvc/application/models/StoredFile.php