Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
Removed this silly airtime-update-db-settings script

* No longer needed, was a horrible hack in the first place.
CC-5802: Upgrade application.ini file

Remove this upgrade step from the upgrade controller
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
Merge branch 'cc-5709-airtime-analyzer-saas' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-saas
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php