Merge branch '2.5.x' into cc-5709-airtime-analyzer
Don't throw exceptions for localhost in CORSHelper.
CC-5932: Update is_scheduled query is too slow
Merge branch '2.5.x' into saas
CC-5932: Update is_scheduled query is too slow

Forgot to remove some debugging statements
Merge branch '2.5.x' into saas
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
Merge pull request #76 from RobertElder/saas-relder-cors-localhost

Don't throw exceptions for localhost in CORSHelper.
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
CC-5935 - Added fix for insidious pypofetch bug causing dangling RabbitMQ channel
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
Merge branch '2.5.x' into saas
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas