CC-3346: Recorder: Merge recorder with pypo

- Upgrade for 2.0.2

Conflicts:

	VERSION
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py

install_minimal/upgrades/airtime-2.0.2/propel/airtime-conf.php

@@ -0,0 +1,28 @@
+<?php
+// This file generated by Propel 1.5.2 convert-conf target - with modifications by Martin
+// from XML runtime conf file /home/naomiaro/dev-campcaster/campcaster/build/runtime-conf.xml
+
+$ini = parse_ini_file('/etc/airtime/airtime.conf', true);
+
+$dbhost = $ini['database']['host'];
+$dbname = $ini['database']['dbname'];
+$dbuser = $ini['database']['dbuser'];
+$dbpass = $ini['database']['dbpass'];
+
+$conf = array (
+  'datasources' => 
+  array (
+    'airtime' => 
+    array (
+      'adapter' => 'pgsql',
+      'connection' => 
+      array (
+        'dsn' => "pgsql:host=$dbhost;port=5432;dbname=$dbname;user=$dbuser;password=$dbpass",
+      ),
+    ),
+    'default' => 'airtime',
+  ),
+  'generator_version' => '1.5.2',
+);
+$conf['classmap'] = include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php');
+return $conf;