Merge branch '2.5.x' into cc-5709-airtime-analyzer
Merge pull request #75 - Saas relder csrf delete file
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
Merge branch 'cc-5709-airtime-analyzer' into saas
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas

Conflicts:
	airtime_mvc/application/modules/rest/controllers/MediaController.php