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/CcCountryPeer.php

@@ -0,0 +1,18 @@
+<?php
+
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'cc_country' table.
+ *
+ * 
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.airtime
+ */
+class CcCountryPeer extends BaseCcCountryPeer {
+
+} // CcCountryPeer