Improved some comments
Updated FTP upload hook script with new vhost.map file location
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
sometimes
Fixed 'clear' button not working when files failed to import
Merge branch 'cc-5709-airtime-analyzer' into saas
Slightly more robust fix for the last issue
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
Merge branch 'cc-5709-airtime-analyzer' into saas
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
Remove base URL from selenium tests to make the Selenium IDE happy
Merge branch '2.5.x' into saas
Removed base URL from saas Selenium tests and added missing Account
Plans tests
Scheduler->removeItems optimization
Removed undefined index from show info array
Schedule->removeItems optimization fix for deleting the current playing track
Temporarily fix live stream auth (show source)
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
Undo live stream auth action breakage