Merge branch '2.0.x' into devel

Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py

install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

@@ -617,7 +617,18 @@ class Airtime190Upgrade{
 
         echo "Save DbMd to File".PHP_EOL;
 
-        $stor_dir = realpath($values['general']['base_files_dir']."/stor");
+
+        /* Do not use realpath. It expands a symlinked path into its real path
+         * which then causes us problems for string comparisons later on. */
+        //$stor_dir = realpath($values['general']['base_files_dir']."/stor");
+
+        $baseDir = $values['general']['base_files_dir'];
+        if ($baseDir[strlen($baseDir)-1] != '/'){
+            $baseDir.='/';
+        }
+        
+        $stor_dir = $baseDir.'stor';
+
 
         $files = CcFilesQuery::create()
            ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)